Componentize HistoryMatch

HistoryMatch is placed under the history namespace and has no dependency to autocomplete. It should be placed under components/history. BUG=388515 TEST=build Review URL: https://codereview.chromium.org/371283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281971 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jul 9, 2014 · bac78f9 · bac78f9
1 parent 32a0c88
commit bac78f9
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
@@ -11,9 +11,9 @@
 #include "base/compiler_specific.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/autocomplete/history_provider.h"
-#include "chrome/browser/autocomplete/history_provider_util.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "components/autocomplete/autocomplete_input.h"
+#include "components/history/core/browser/history_match.h"
 #include "components/search_engines/template_url.h"
 
 class Profile;

diff --git a/chrome/browser/history/DEPS b/chrome/browser/history/DEPS
@@ -19,7 +19,6 @@ include_rules = [
   # http://crbug.com/370850
   "!chrome/browser/autocomplete/autocomplete_match.h",
   "!chrome/browser/autocomplete/autocomplete_result.h",
-  "!chrome/browser/autocomplete/history_provider_util.h",
   "!chrome/browser/autocomplete/history_url_provider.h",
   "!chrome/browser/bookmarks/bookmark_model_factory.h",
   "!chrome/browser/browser_process.h",

diff --git a/chrome/browser/history/scored_history_match.h b/chrome/browser/history/scored_history_match.h
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include "base/strings/string16.h"
-#include "chrome/browser/autocomplete/history_provider_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/in_memory_url_index_types.h"
+#include "components/history/core/browser/history_match.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace history {

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -143,8 +143,6 @@
       'browser/autocomplete/chrome_autocomplete_scheme_classifier.h',
       'browser/autocomplete/history_provider.cc',
       'browser/autocomplete/history_provider.h',
-      'browser/autocomplete/history_provider_util.cc',
-      'browser/autocomplete/history_provider_util.h',
       'browser/autocomplete/history_quick_provider.cc',
       'browser/autocomplete/history_quick_provider.h',
       'browser/autocomplete/history_url_provider.cc',

diff --git a/components/history.gypi b/components/history.gypi
@@ -21,6 +21,8 @@
       'sources': [
         'history/core/browser/history_client.cc',
         'history/core/browser/history_client.h',
+        'history/core/browser/history_match.cc',
+        'history/core/browser/history_match.h',
         'history/core/browser/in_memory_database.cc',
         'history/core/browser/in_memory_database.h',
         'history/core/browser/keyword_id.h',

diff --git a/...ser/autocomplete/history_provider_util.cc → ...nts/history/core/browser/history_match.cc b/...ser/autocomplete/history_provider_util.cc → ...nts/history/core/browser/history_match.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/autocomplete/history_provider_util.h"
+#include "components/history/core/browser/history_match.h"
 
 #include "base/logging.h"
 

diff --git a/...wser/autocomplete/history_provider_util.h → ...ents/history/core/browser/history_match.h b/...wser/autocomplete/history_provider_util.h → ...ents/history/core/browser/history_match.h
@@ -1,14 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
-#define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
+#ifndef COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MATCH_H_
+#define COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MATCH_H_
 
 #include <deque>
-#include <vector>
 
-#include "chrome/browser/history/history_types.h"
+#include "components/history/core/browser/url_row.h"
 
 namespace history {
 
@@ -55,4 +54,4 @@ typedef std::deque<HistoryMatch> HistoryMatches;
 
 }  // namespace history
 
-#endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_PROVIDER_UTIL_H_
+#endif  // COMPONENTS_HISTORY_CORE_BROWSER_HISTORY_MATCH_H_