diff options
| author | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 01:49:37 +0000 |
|---|---|---|
| committer | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 01:49:37 +0000 |
| commit | e2b3105663a4c7c93b55b766876766b5eb862f8b (patch) | |
| tree | 0eea990802edd29d2340b3bcca74f10125cccdab /components/autofill | |
| parent | b11bc41872348a93258f4aa780b778d63eab9bea (diff) | |
| download | chromium_src-e2b3105663a4c7c93b55b766876766b5eb862f8b.zip chromium_src-e2b3105663a4c7c93b55b766876766b5eb862f8b.tar.gz chromium_src-e2b3105663a4c7c93b55b766876766b5eb862f8b.tar.bz2 | |
Split Autofill webdata
Depends on https://codereview.chromium.org/12853004/
TBR=tim@chromium.org,sky@chromium.org
(tim@ for sync, sky@ for seach_engines)
COLLABORATOR=joi@chromium.org
COLLABORATOR=kaiwang@chromium.org
BUG=181277
Review URL: https://chromiumcodereview.appspot.com/12695015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/autofill')
3 files changed, 9 insertions, 8 deletions
diff --git a/components/autofill/browser/autocomplete_history_manager_unittest.cc b/components/autofill/browser/autocomplete_history_manager_unittest.cc index 039e118..03b4636 100644 --- a/components/autofill/browser/autocomplete_history_manager_unittest.cc +++ b/components/autofill/browser/autocomplete_history_manager_unittest.cc @@ -9,7 +9,6 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/webdata/autofill_web_data_service_impl.h" -#include "chrome/browser/webdata/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" @@ -31,9 +30,11 @@ using testing::_; namespace { -class MockWebDataService : public WebDataService { +class MockWebDataService : public AutofillWebDataServiceImpl { public: - MockWebDataService() { + MockWebDataService() + : AutofillWebDataServiceImpl( + NULL, WebDataServiceBase::ProfileErrorCallback()) { current_mock_web_data_service_ = this; } @@ -65,7 +66,7 @@ class MockWebDataServiceWrapperCurrent : public MockWebDataServiceWrapperBase { MockWebDataServiceWrapperCurrent() {} - scoped_refptr<WebDataService> GetWebData() OVERRIDE { + scoped_refptr<AutofillWebDataService> GetAutofillWebData() OVERRIDE { return MockWebDataService::GetCurrent(); } diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc index dd7c70f..452a113 100644 --- a/components/autofill/browser/autofill_metrics_unittest.cc +++ b/components/autofill/browser/autofill_metrics_unittest.cc @@ -8,10 +8,10 @@ #include "base/string16.h" #include "base/time.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/api/webdata/web_data_results.h" #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h" -#include "chrome/browser/webdata/web_data_service.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "components/autofill/browser/autocheckout_page_meta_data.h" diff --git a/components/autofill/browser/personal_data_manager_unittest.cc b/components/autofill/browser/personal_data_manager_unittest.cc index 2a21f9a..2b47013b 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/webdata/web_data_service.h" +#include "chrome/browser/api/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" @@ -459,8 +459,8 @@ TEST_F(PersonalDataManagerTest, Refresh) { profile_pointers.push_back(&profile2); AutofillProfile::AdjustInferredLabels(&profile_pointers); - scoped_refptr<WebDataService> wds = - WebDataService::FromBrowserContext(profile_.get()); + scoped_refptr<AutofillWebDataService> wds = + AutofillWebDataService::FromBrowserContext(profile_.get()); ASSERT_TRUE(wds.get()); wds->AddAutofillProfile(profile2); |