Moved WebDataService to ProfileKeyedService

chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc

 // Copyright (c) 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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
+#include "base/synchronization/waitable_event.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::DataTypeController;
 using content::BrowserThread;
 
 class ProfileSyncComponentsFactoryImplTest : public testing::Test {
  protected:
   ProfileSyncComponentsFactoryImplTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_) {}
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        db_thread_(BrowserThread::DB) {}
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
+    db_thread_.Start();
     profile_.reset(new TestingProfile());
     FilePath program_path(FILE_PATH_LITERAL("chrome.exe"));
     command_line_.reset(new CommandLine(program_path));
   }
 
+  virtual void TearDown() OVERRIDE {
+    profile_.reset();
+    // Schedule another task on the DB thread to notify us that it's safe to
+    // carry on with the test.
+    base::WaitableEvent done(false, false);
+    BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
+        base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
+    done.Wait();
+    db_thread_.Stop();
+  }
+
   // Returns the collection of default datatypes.
   static std::vector<syncable::ModelType> DefaultDatatypes() {
     std::vector<syncable::ModelType> datatypes;
     datatypes.push_back(syncable::APPS);
     datatypes.push_back(syncable::APP_NOTIFICATIONS);
     datatypes.push_back(syncable::APP_SETTINGS);
     datatypes.push_back(syncable::AUTOFILL);
     datatypes.push_back(syncable::AUTOFILL_PROFILE);
     datatypes.push_back(syncable::BOOKMARKS);
     datatypes.push_back(syncable::EXTENSIONS);
@@ skipping 28 matching lines @@
         EXPECT_EQ(1U, map->count(*iter))
             << *iter << " not found in datatypes map";
     }
   }
 
   // Asserts that if you apply the command line switch |cmd_switch|,
   // all types are enabled except for |type|, which is disabled.
   void TestSwitchDisablesType(const char* cmd_switch,
                               syncable::ModelType type) {
     command_line_->AppendSwitch(cmd_switch);
+    WebDataServiceFactory::GetInstance()->SetTestingFactory(profile_.get(),
+                                                            NULL);
     scoped_ptr<ProfileSyncService> pss(
         new ProfileSyncService(
             new ProfileSyncComponentsFactoryImpl(profile_.get(),
                                                  command_line_.get()),
             profile_.get(),
             NULL,
             ProfileSyncService::MANUAL_START));
     pss->factory()->RegisterDataTypes(pss.get());
     DataTypeController::StateMap controller_states;
     pss->GetDataTypeControllerStates(&controller_states);
     EXPECT_EQ(DefaultDatatypesCount() - 1, controller_states.size());
     CheckDefaultDatatypesInMapExcept(&controller_states, type);
   }
 
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread db_thread_;
   scoped_ptr<Profile> profile_;
   scoped_ptr<CommandLine> command_line_;
 };
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDefault) {
+  WebDataServiceFactory::GetInstance()->SetTestingFactory(profile_.get(),
+                                                          NULL);
   scoped_ptr<ProfileSyncService> pss(
       new ProfileSyncService(
           new ProfileSyncComponentsFactoryImpl(profile_.get(),
                                                command_line_.get()),
       profile_.get(),
       NULL,
       ProfileSyncService::MANUAL_START));
   pss->factory()->RegisterDataTypes(pss.get());
   DataTypeController::StateMap controller_states;
   pss->GetDataTypeControllerStates(&controller_states);
@@ skipping 33 matching lines @@
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisableAutofillProfile) {
   TestSwitchDisablesType(switches::kDisableSyncAutofillProfile,
                          syncable::AUTOFILL_PROFILE);
 }
 
 TEST_F(ProfileSyncComponentsFactoryImplTest, CreatePSSDisablePasswords) {
   TestSwitchDisablesType(switches::kDisableSyncPasswords,
                          syncable::PASSWORDS);
 }