Moved WebDataService to ProfileKeyedService

chrome/browser/search_engines/template_url_service_sync_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 "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
@@ skipping 131 matching lines @@
  public:
   typedef TemplateURLService::SyncDataMap SyncDataMap;
 
   TemplateURLServiceSyncTest()
       : sync_processor_(new TestChangeProcessor),
         sync_processor_delegate_(new SyncChangeProcessorDelegate(
             sync_processor_.get())) {}
 
   virtual void SetUp() {
     profile_a_.reset(new TestingProfile);
+    WebDataServiceFactory::GetInstance()->SetTestingFactory(
+        profile_a_.get(), TemplateURLServiceSyncTest::BuildNull);
     TemplateURLServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(
         profile_a_.get());
     model_a_.reset(new TemplateURLService(profile_a_.get()));
     model_a_->Load();
     profile_b_.reset(new TestingProfile);
+    WebDataServiceFactory::GetInstance()->SetTestingFactory(
+        profile_b_.get(), TemplateURLServiceSyncTest::BuildNull);
     TemplateURLServiceFactory::GetInstance()->RegisterUserPrefsOnProfile(
         profile_b_.get());
     model_b_.reset(new TemplateURLService(profile_b_.get()));
     model_b_->Load();
   }
 
   virtual void TearDown() { }
 
   TemplateURLService* model() { return model_a_.get(); }
   // For readability, we redefine an accessor for Model A for use in tests that
@@ skipping 110 matching lines @@
     list.push_back(TemplateURLService::CreateSyncDataFromTemplateURL(*turl));
 
     return list;
   }
 
   // Syntactic sugar.
   TemplateURL* Deserialize(const SyncData& sync_data) {
     return TemplateURLService::CreateTemplateURLFromSyncData(sync_data);
   }
 
+  // Build no service.
+  static scoped_refptr<RefcountedProfileKeyedService> BuildNull(

[Peter Kasting, 2012/03/27 18:18:25]

Nit: It seems like this is something that should or could exist somewhere in the
core ProfileKeyedService headers, as a utility for people who want to disable
their services for certain tests, so you wouldn't need to re-define it in
several files.

[GeorgeY, 2012/03/30 19:20:12]

Done - removed

+      Profile* profile) {
+    return NULL;
+  }
+
  protected:
   // We keep two TemplateURLServices to test syncing between them.
   scoped_ptr<TestingProfile> profile_a_;
   scoped_ptr<TemplateURLService> model_a_;
   scoped_ptr<TestingProfile> profile_b_;
   scoped_ptr<TemplateURLService> model_b_;
 
   // Our dummy ChangeProcessor used to inspect changes pushed to Sync.
   scoped_ptr<TestChangeProcessor> sync_processor_;
   scoped_ptr<SyncChangeProcessorDelegate> sync_processor_delegate_;
@@ skipping 940 matching lines @@
 
   // The key1 entry should be a duplicate of the default.
   model()->MergeDataAndStartSyncing(syncable::SEARCH_ENGINES,
                                     CreateInitialSyncData(), PassProcessor());
 
   EXPECT_EQ(3U, model()->GetAllSyncData(syncable::SEARCH_ENGINES).size());
   EXPECT_FALSE(model()->GetTemplateURLForGUID("whateverguid"));
   EXPECT_EQ(model()->GetDefaultSearchProvider(),
             model()->GetTemplateURLForGUID("key1"));
 }