diff options
| author | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 09:06:45 +0000 |
|---|---|---|
| committer | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-27 09:06:45 +0000 |
| commit | ec41ec02827a1adc6e3f502dd25a278b38bcc6ec (patch) | |
| tree | f0d16c0c95d82aa6dbd32812b248ec542d4c07be /components/autofill | |
| parent | 6e6c451cdfbc3acfaa0dda793836068dba2ffc13 (diff) | |
| download | chromium_src-ec41ec02827a1adc6e3f502dd25a278b38bcc6ec.zip chromium_src-ec41ec02827a1adc6e3f502dd25a278b38bcc6ec.tar.gz chromium_src-ec41ec02827a1adc6e3f502dd25a278b38bcc6ec.tar.bz2 | |
Depends on https://codereview.chromium.org/12987023/
TBR=ben@chromium.org
(API changes)
BUG=181277
Review URL: https://chromiumcodereview.appspot.com/12937016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/autofill')
5 files changed, 8 insertions, 7 deletions
diff --git a/components/autofill/browser/DEPS b/components/autofill/browser/DEPS index 9aa86cd..725cc13 100644 --- a/components/autofill/browser/DEPS +++ b/components/autofill/browser/DEPS @@ -18,6 +18,7 @@ include_rules = [ # TODO(joi, kaiwang): Bring this list to zero. "!chrome/browser/api/webdata", + "!chrome/browser/webdata", # TODO(akalin): Remove this dependency. "!sync/util/data_encryption_win.h", @@ -48,7 +49,7 @@ specific_include_rules = { "!chrome/browser/ui/browser_tabstrip.h", "!chrome/browser/ui/browser_window.h", "!chrome/browser/ui/tabs/tab_strip_model.h", - "!chrome/browser/webdata/autofill_web_data_service_impl.h", + "!chrome/browser/webdata/autofill_web_data_service.h", "!chrome/browser/webdata/web_data_service.h", "!chrome/browser/webdata/web_data_service_factory.h", "!chrome/browser/webdata/web_data_service_test_util.h", diff --git a/components/autofill/browser/autocomplete_history_manager.h b/components/autofill/browser/autocomplete_history_manager.h index fc70e85..cfb0e22 100644 --- a/components/autofill/browser/autocomplete_history_manager.h +++ b/components/autofill/browser/autocomplete_history_manager.h @@ -9,8 +9,8 @@ #include "base/gtest_prod_util.h" #include "base/prefs/pref_member.h" -#include "chrome/browser/api/webdata/autofill_web_data_service.h" #include "chrome/browser/api/webdata/web_data_service_consumer.h" +#include "chrome/browser/webdata/autofill_web_data_service.h" #include "content/public/browser/web_contents_observer.h" struct FormData; diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc index 03b4636..b04d5b9 100644 --- a/components/autofill/browser/autocomplete_history_manager_unittest.cc +++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc @@ -8,7 +8,7 @@ #include "base/prefs/testing_pref_service.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/webdata/autofill_web_data_service_impl.h" +#include "chrome/browser/webdata/autofill_web_data_service.h" #include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/browser/webdata/web_data_service_test_util.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" @@ -30,10 +30,10 @@ using testing::_; namespace { -class MockWebDataService : public AutofillWebDataServiceImpl { +class MockWebDataService : public AutofillWebDataService { public: MockWebDataService() - : AutofillWebDataServiceImpl( + : AutofillWebDataService( NULL, WebDataServiceBase::ProfileErrorCallback()) { current_mock_web_data_service_ = this; } diff --git a/components/autofill/browser/personal_data_manager.cc b/components/autofill/browser/personal_data_manager.cc index 0e69187..58b8e17 100644 --- a/components/autofill/browser/personal_data_manager.cc +++ b/components/autofill/browser/personal_data_manager.cc @@ -12,7 +12,7 @@ #include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/webdata/autofill_web_data_service.h" +#include "chrome/browser/webdata/autofill_web_data_service.h" #include "chrome/common/chrome_notification_types.h" #include "components/autofill/browser/autofill-inl.h" #include "components/autofill/browser/autofill_country.h" diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc index 2b47013b..93eea0d 100644 --- a/components/autofill/browser/personal_data_manager_unittest.cc +++ b/components/autofill/browser/personal_data_manager_unittest.cc @@ -10,7 +10,7 @@ #include "base/message_loop.h" #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/api/webdata/autofill_web_data_service.h" +#include "chrome/browser/webdata/autofill_web_data_service.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/autofill/browser/autofill_common_test.h" |