Split Autofill webdata

chrome/browser/sync/profile_sync_service_autofill_unittest.cc

 // Copyright 2012 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 <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 22 matching lines @@
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
 #include "chrome/browser/sync/test_profile_sync_service.h"
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.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_database.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/personal_data_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ skipping 92 matching lines @@
 }
 
 template<>
 syncer::ModelType GetModelType<AutofillProfile>() {
   return syncer::AUTOFILL_PROFILE;
 }
 
 class WebDataServiceFake : public WebDataService {
  public:
   WebDataServiceFake()
-      : web_database_(NULL),
+      : WebDataService(),
+        web_database_(NULL),
         syncable_service_created_or_destroyed_(false, false) {
   }
 
   void SetDatabase(WebDatabase* web_database) {
     web_database_ = web_database;
   }
 
   void StartSyncableService() {
     // The |autofill_profile_syncable_service_| must be constructed on the DB
     // thread.
@@ skipping 13 matching lines @@
   }
 
   virtual bool IsDatabaseLoaded() OVERRIDE {
     return true;
   }
 
   virtual WebDatabase* GetDatabase() OVERRIDE {
     return web_database_;
   }
 
-  virtual WebDataService::Handle GetAllTokens(
+/*  virtual WebDataService::Handle GetAllTokens(
       WebDataServiceConsumer* consumer) OVERRIDE {
     // TODO(tim): It would be nice if WebDataService was injected on
     // construction of TokenService rather than fetched by Initialize so that
     // this isn't necessary (we could pass a NULL service). We currently do
     // return it via EXPECT_CALLs, but without depending on order-of-
     // initialization (which seems way more fragile) we can't tell which
     // component is asking at what time, and some components in these Autofill
     // tests require a WebDataService.
     return 0;
-  }
+  }*/
 
-  virtual AutocompleteSyncableService*
-      GetAutocompleteSyncableService() const OVERRIDE {
-    EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
-    EXPECT_TRUE(autocomplete_syncable_service_);
-
-    return autocomplete_syncable_service_;
-  }
-
-  virtual AutofillProfileSyncableService*
-      GetAutofillProfileSyncableService() const OVERRIDE {
-    EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
-    EXPECT_TRUE(autofill_profile_syncable_service_);
-
-    return autofill_profile_syncable_service_;
-  }
+  virtual void ShutdownOnUIThread() OVERRIDE {}
 
  private:
   virtual ~WebDataServiceFake() {}
 
   void CreateSyncableService() {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
     // These services are deleted in DestroySyncableService().
-    autocomplete_syncable_service_ = new AutocompleteSyncableService(this);
-    autofill_profile_syncable_service_ =
-        new AutofillProfileSyncableService(this);
+    AutocompleteSyncableService::CreateForWebDataService(this);
+    AutofillProfileSyncableService::CreateForWebDataService(this);
     syncable_service_created_or_destroyed_.Signal();
   }
 
   void DestroySyncableService() {
     ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
-    delete autofill_profile_syncable_service_;
-    delete autocomplete_syncable_service_;
+    WebDataServiceBase::ShutdownOnDBThread();
     syncable_service_created_or_destroyed_.Signal();
   }
 
   WebDatabase* web_database_;
 
-  // We own the syncable services, but don't use a |scoped_ptr| because the
-  // lifetime must be managed on the DB thread.
-  AutocompleteSyncableService* autocomplete_syncable_service_;
-  AutofillProfileSyncableService* autofill_profile_syncable_service_;
   WaitableEvent syncable_service_created_or_destroyed_;
 };
 
 class MockWebDataServiceWrapper : public WebDataServiceWrapper {
  public:
   static ProfileKeyedService* Build(Profile* profile) {
     return new MockWebDataServiceWrapper();
   }
 
   MockWebDataServiceWrapper() {
     web_data_service_fake_ = new WebDataServiceFake();
   }
 
   void Shutdown() OVERRIDE {
   }
 
   scoped_refptr<WebDataService> GetWebData() OVERRIDE {
     return web_data_service_fake_;
   }
 
+    scoped_refptr<AutofillWebDataService> GetAutofillWebData() OVERRIDE {

[Jói, 2013/03/19 20:53:58]

indent -2

[Cait (Slow), 2013/03/20 22:21:10]

Done.

+    return new AutofillWebDataServiceImpl(NULL,
+          WebDataServiceBase::ProfileErrorCallback());
+  }
+
   ~MockWebDataServiceWrapper() {
   }
 
  private:
   scoped_refptr<WebDataServiceFake> web_data_service_fake_;
 
   DISALLOW_COPY_AND_ASSIGN(MockWebDataServiceWrapper);
 };
 
 ACTION_P(MakeAutocompleteSyncComponents, wds) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!BrowserThread::CurrentlyOn(BrowserThread::DB))
     return base::WeakPtr<syncer::SyncableService>();
-  return wds->GetAutocompleteSyncableService()->AsWeakPtr();
+  return AutocompleteSyncableService::FromWebDataService(wds)->AsWeakPtr();
 }
 
 ACTION_P(ReturnNewDataTypeManagerWithDebugListener, debug_listener) {
   return new browser_sync::DataTypeManagerImpl(
       debug_listener,
       arg1,
       arg2,
       arg3,
       arg4);
 }
 
 ACTION(MakeGenericChangeProcessor) {
   syncer::UserShare* user_share = arg0->GetUserShare();
   return new GenericChangeProcessor(
       arg1,
       arg2,
       arg3,
       user_share);
 }
 
 ACTION(MakeSharedChangeProcessor) {
   return new SharedChangeProcessor();
 }
 
 ACTION_P(MakeAutofillProfileSyncComponents, wds) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!BrowserThread::CurrentlyOn(BrowserThread::DB))
     return base::WeakPtr<syncer::SyncableService>();;
-  return wds->GetAutofillProfileSyncableService()->AsWeakPtr();
+  return AutofillProfileSyncableService::FromWebDataService(wds)->AsWeakPtr();
 }
 
 class AbstractAutofillFactory {
  public:
   virtual DataTypeController* CreateDataTypeController(
       ProfileSyncComponentsFactory* factory,
       ProfileMock* profile,
       ProfileSyncService* service) = 0;
   virtual void SetExpectation(ProfileSyncComponentsFactoryMock* factory,
                               ProfileSyncService* service,
@@ skipping 1025 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
              << ", " << sync_entries[i].key().value();
   }
 }