Move AutocompleteHistoryManager into chrome/browser/autofill/ as it is

tightly coupled with, and only used by, the autofill feature.  The
only other usage is from TabContents, which initializes and owns an
instance and provides an accessor, but we should be able to remove
this soon.

TBR=ben@chromium.org
BUG=140037

Review URL: https://chromiumcodereview.appspot.com/10843067

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

10 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/autofill/DEPS b/chrome/browser/autofill/DEPS
index 36897d1..15e9e50 100644
--- a/chrome/browser/autofill/DEPS
+++ b/chrome/browser/autofill/DEPS
@@ -10,13 +10,13 @@ include_rules = [
   #
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
-  "!chrome/browser/autocomplete_history_manager.h",
   "!chrome/browser/browser_process.h",
   "!chrome/browser/feedback/proto/extension.pb.h",
   "!chrome/browser/infobars/infobar_tab_helper.h",
   "!chrome/browser/password_manager/encryptor.h",
   "!chrome/browser/password_manager/password_manager.h",
   "!chrome/browser/prefs/pref_change_registrar.h",
+  "!chrome/browser/prefs/pref_member.h",
   "!chrome/browser/prefs/pref_service.h",
   "!chrome/browser/profiles/profile.h",
   "!chrome/browser/profiles/profile_dependency_manager.h",
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autofill/autocomplete_history_manager.cc
index b026753..ff7803f 100644
--- a/chrome/browser/autocomplete_history_manager.cc
+++ b/chrome/browser/autofill/autocomplete_history_manager.cc
@@ -2,7 +2,7 @@
 // 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_manager.h"
+#include "chrome/browser/autofill/autocomplete_history_manager.h"
 
 #include <vector>
 
diff --git a/chrome/browser/autocomplete_history_manager.h b/chrome/browser/autofill/autocomplete_history_manager.h
index 61a4da8..fd38701 100644
--- a/chrome/browser/autocomplete_history_manager.h
+++ b/chrome/browser/autofill/autocomplete_history_manager.h
@@ -2,8 +2,8 @@
 // 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_MANAGER_H_
-#define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
+#ifndef CHROME_BROWSER_AUTOFILL_AUTOCOMPLETE_HISTORY_MANAGER_H_
+#define CHROME_BROWSER_AUTOFILL_AUTOCOMPLETE_HISTORY_MANAGER_H_
 
 #include <vector>
 
@@ -98,4 +98,4 @@ class AutocompleteHistoryManager : public content::WebContentsObserver,
   DISALLOW_COPY_AND_ASSIGN(AutocompleteHistoryManager);
 };
 
-#endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
+#endif  // CHROME_BROWSER_AUTOFILL_AUTOCOMPLETE_HISTORY_MANAGER_H_
diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autofill/autocomplete_history_manager_unittest.cc
index 7b09f55..61634cb 100644
--- a/chrome/browser/autocomplete_history_manager_unittest.cc
+++ b/chrome/browser/autofill/autocomplete_history_manager_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autocomplete_history_manager.h"
+#include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/webdata/web_data_service.h"
diff --git a/chrome/browser/autofill/autofill_external_delegate.cc b/chrome/browser/autofill/autofill_external_delegate.cc
index ada423f..a199b06 100644
--- a/chrome/browser/autofill/autofill_external_delegate.cc
+++ b/chrome/browser/autofill/autofill_external_delegate.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autocomplete_history_manager.h"
+#include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/common/autofill_messages.h"
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc
index 96e5ff9..d6f62d9 100644
--- a/chrome/browser/autofill/autofill_manager.cc
+++ b/chrome/browser/autofill/autofill_manager.cc
@@ -19,7 +19,7 @@
 #include "base/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autocomplete_history_manager.h"
+#include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_feedback_infobar_delegate.h"
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index 9f96092..408a4ce 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/time.h"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/autocomplete_history_manager.h"
+#include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index aa24534..3c4a81f 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -6,7 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
-#include "chrome/browser/autocomplete_history_manager.h"
+#include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b4b15ca..56ac5351 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -168,12 +168,12 @@
         'browser/autocomplete/shortcuts_provider.h',
         'browser/autocomplete/url_prefix.cc',
         'browser/autocomplete/url_prefix.h',
-        'browser/autocomplete_history_manager.cc',
-        'browser/autocomplete_history_manager.h',
         'browser/autofill/address.cc',
         'browser/autofill/address.h',
         'browser/autofill/address_field.cc',
         'browser/autofill/address_field.h',
+        'browser/autofill/autocomplete_history_manager.cc',
+        'browser/autofill/autocomplete_history_manager.h',
         'browser/autofill/autofill-inl.h',
         'browser/autofill/autofill_cc_infobar_delegate.cc',
         'browser/autofill/autofill_cc_infobar_delegate.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 164c185..d7e6e915 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1016,9 +1016,9 @@
         'browser/autocomplete/keyword_provider_unittest.cc',
         'browser/autocomplete/search_provider_unittest.cc',
         'browser/autocomplete/shortcuts_provider_unittest.cc',
-        'browser/autocomplete_history_manager_unittest.cc',
         'browser/autofill/address_field_unittest.cc',
         'browser/autofill/address_unittest.cc',
+        'browser/autofill/autocomplete_history_manager_unittest.cc',
         'browser/autofill/autofill_country_unittest.cc',
         'browser/autofill/autofill_download_unittest.cc',
         'browser/autofill/autofill_external_delegate_unittest.cc',