Kill WebDataService, move (WIN only) Password code into separate class.

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 <utility>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 191 matching lines @@
   TokenWebDataServiceFake()
       : TokenWebData(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB)) {
   }
 
   virtual bool IsDatabaseLoaded() OVERRIDE {
     return true;
   }
 
-  virtual WebDataService::Handle GetAllTokens(
+  virtual AutofillWebDataService::Handle GetAllTokens(
       WebDataServiceConsumer* consumer) OVERRIDE {
     // TODO(tim): It would be nice if WebDataService was injected on
     // construction of ProfileOAuth2TokenService 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;
   }
@@ skipping 113 matching lines @@
   AutofillProfileSyncableService* autofill_profile_syncable_service_;
   scoped_ptr<autofill::AutofillWebDataBackend> backend_;
 
   WaitableEvent syncable_service_created_or_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDataServiceFake);
 };
 
 KeyedService* BuildMockWebDataServiceWrapper(content::BrowserContext* profile) {
   return new MockWebDataServiceWrapper(
-      NULL,
       new WebDataServiceFake(),
       new TokenWebDataServiceFake());
 }
 
 ACTION_P(MakeAutocompleteSyncComponents, wds) {
   EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (!BrowserThread::CurrentlyOn(BrowserThread::DB))
     return base::WeakPtr<syncer::SyncableService>();
   return AutocompleteSyncableService::FromWebDataService(wds)->AsWeakPtr();
 }
@@ skipping 1017 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();
   }
 }