Componentize autocomplete_match_type.

BUG=388510
R=pkasting@chromium.org
TBR=nyquist@chromium.org
TEST=build all

Review URL: https://codereview.chromium.org/377153004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282211 0039d316-1c4b-4281-b951-d872f2087c98

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxSuggestion.java

@@ -30,7 +30,7 @@ public class OmniboxSuggestion {
 
     /**
      * This should be kept in sync with AutocompleteMatch::Type
-     * (see chrome/common/autocomplete_match_type.h).
+     * (see components/autocomplete/autocomplete_match_type.h).
      * Negative types are specific to Chrome on Android front-end.
      */
     public static enum Type {

chrome/browser/android/omnibox/autocomplete_controller_android.cc

@@ -30,11 +30,11 @@
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
-#include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/autocomplete/autocomplete_input.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/search_engines/template_url_service.h"

chrome/browser/autocomplete/autocomplete_match.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/common/autocomplete_match_type.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "components/search_engines/template_url.h"
 #include "content/public/common/page_transition_types.h"
 #include "url/gurl.h"

chrome/browser/autocomplete/autocomplete_result.cc

@@ -14,7 +14,6 @@
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/common/autocomplete_match_type.h"
 #include "components/autocomplete/autocomplete_input.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"

chrome/browser/autocomplete/autocomplete_result_unittest.cc

@@ -16,9 +16,9 @@
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/search_engines/template_url_service_test_util.h"
-#include "chrome/common/autocomplete_match_type.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autocomplete/autocomplete_input.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"

chrome/browser/autocomplete/history_quick_provider.cc

@@ -30,10 +30,10 @@
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"

chrome/browser/autocomplete/shortcuts_backend.cc

@@ -24,9 +24,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
-#include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/autocomplete/autocomplete_input.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"

chrome/browser/history/shortcuts_database.cc

@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "chrome/common/autocomplete_match_type.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "content/public/common/page_transition_types.h"
 #include "sql/meta_table.h"
 #include "sql/statement.h"

chrome/browser/history/shortcuts_database_unittest.cc

@@ -9,10 +9,10 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/shortcuts_database.h"
-#include "chrome/common/autocomplete_match_type.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "content/public/common/page_transition_types.h"
 #include "sql/statement.h"
 #include "sql/test/test_helpers.h"

chrome/browser/omnibox/omnibox_field_trial.h

@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "chrome/common/autocomplete_match_type.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 
 namespace base {

chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm

@@ -16,7 +16,7 @@
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
-#include "chrome/common/autocomplete_match_type.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"

chrome/chrome_common.gypi

@@ -11,8 +11,6 @@
       'common/attrition_experiments.h',
       'common/auto_start_linux.cc',
       'common/auto_start_linux.h',
-      'common/autocomplete_match_type.cc',
-      'common/autocomplete_match_type.h',
       'common/badge_util.cc',
       'common/badge_util.h',
       'common/child_process_logging.h',

components/autocomplete.gypi

@@ -20,6 +20,8 @@
       'sources': [
         'autocomplete/autocomplete_input.cc',
         'autocomplete/autocomplete_input.h',
+        'autocomplete/autocomplete_match_type.cc',
+        'autocomplete/autocomplete_match_type.h',
         'autocomplete/autocomplete_scheme_classifier.h',
         'autocomplete/url_prefix.cc',
         'autocomplete/url_prefix.h',

chrome/common/autocomplete_match_type.cc → components/autocomplete/autocomplete_match_type.cc

-// Copyright 2013 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/common/autocomplete_match_type.h"
+#include "components/autocomplete/autocomplete_match_type.h"
 
 #include "base/basictypes.h"
 

chrome/common/autocomplete_match_type.h → components/autocomplete/autocomplete_match_type.h

-// Copyright 2013 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_COMMON_AUTOCOMPLETE_MATCH_TYPE_H_
-#define CHROME_COMMON_AUTOCOMPLETE_MATCH_TYPE_H_
+#ifndef COMPONENTS_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_TYPE_H_
+#define COMPONENTS_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_TYPE_H_
 
 #include <string>
 
@@ -49,4 +49,4 @@ struct AutocompleteMatchType {
   static std::string ToString(AutocompleteMatchType::Type type);
 };
 
-#endif  // CHROME_COMMON_AUTOCOMPLETE_MATCH_TYPE_H_
+#endif  // COMPONENTS_AUTOCOMPLETE_AUTOCOMPLETE_MATCH_TYPE_H_