Taking over issue 10006037: Moved WebDataService to ProfileKeyedService

chrome/test/base/testing_profile.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 88 matching lines @@
   void CreateBookmarkModel(bool delete_file);
 
   // Creates an AutocompleteClassifier. If not invoked the
   // AutocompleteClassifier is NULL.
   void CreateAutocompleteClassifier();
 
   // Creates a ProtocolHandlerRegistry. If not invoked the protocol handler
   // registry is NULL.
   void CreateProtocolHandlerRegistry();
 
-  // Creates the webdata service.  If |delete_file| is true, the webdata file is
-  // deleted first, then the WebDataService is created.  As TestingProfile
-  // deletes the directory containing the files used by WebDataService, this
-  // only matters if you're recreating the WebDataService.
-  void CreateWebDataService(bool delete_file);
+  // Creates a WebDataService. If not invoked, the web data service is NULL.
+  void CreateWebDataService();
 
   // Blocks until the BookmarkModel finishes loaded. This is NOT invoked from
   // CreateBookmarkModel.
   void BlockUntilBookmarkModelLoaded();
 
   // Blocks until TopSites finishes loading.
   void BlockUntilTopSitesLoaded();
 
   // Creates a TemplateURLService. If not invoked, the TemplateURLService is
   // NULL.
@@ skipping 48 matching lines @@
       GetExtensionSpecialStoragePolicy() OVERRIDE;
   virtual FaviconService* GetFaviconService(ServiceAccessType access) OVERRIDE;
   virtual HistoryService* GetHistoryService(ServiceAccessType access) OVERRIDE;
   virtual HistoryService* GetHistoryServiceWithoutCreating() OVERRIDE;
   // The CookieMonster will only be returned if a Context has been created. Do
   // this by calling CreateRequestContext(). See the note at GetRequestContext
   // for more information.
   net::CookieMonster* GetCookieMonster();
   virtual AutocompleteClassifier* GetAutocompleteClassifier() OVERRIDE;
   virtual history::ShortcutsBackend* GetShortcutsBackend() OVERRIDE;
-  virtual WebDataService* GetWebDataService(ServiceAccessType access) OVERRIDE;
-  virtual WebDataService* GetWebDataServiceWithoutCreating() OVERRIDE;
   // Sets the profile's PrefService. If a pref service hasn't been explicitly
   // set GetPrefs creates one, so normally you need not invoke this. If you need
   // to set a pref service you must invoke this before GetPrefs.
   // TestingPrefService takes ownership of |prefs|.
   void SetPrefService(PrefService* prefs);
   virtual PrefService* GetPrefs() OVERRIDE;
   virtual history::TopSites* GetTopSites() OVERRIDE;
   virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
 
   void CreateRequestContext();
@@ skipping 64 matching lines @@
  private:
   // Common initialization between the two constructors.
   void Init();
 
   // Finishes initialization when a profile is created asynchronously.
   void FinishInit();
 
   // Destroys favicon service if it has been created.
   void DestroyFaviconService();
 
-  // If the webdata service has been created, it is destroyed.  This is invoked
-  // from the destructor.
-  void DestroyWebDataService();
-
   // Creates a TestingPrefService and associates it with the TestingProfile.
   void CreateTestingPrefService();
 
   virtual base::Callback<ChromeURLDataManagerBackend*(void)>
       GetChromeURLDataManagerBackendGetter() const OVERRIDE;
 
   // The favicon service. Only created if CreateFaviconService is invoked.
   scoped_ptr<FaviconService> favicon_service_;
 
   // The history service. Only created if CreateHistoryService is invoked.
   scoped_refptr<HistoryService> history_service_;
 
   // The BookmarkModel. Only created if CreateBookmarkModel is invoked.
   scoped_ptr<BookmarkModel> bookmark_bar_model_;
 
   // The ProtocolHandlerRegistry. Only created if CreateProtocolHandlerRegistry
   // is invoked.
   scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
 
-  // The ProfileSyncService.  Created by CreateProfileSyncService.
-  scoped_ptr<ProfileSyncService> profile_sync_service_;
-
   // The AutocompleteClassifier.  Only created if CreateAutocompleteClassifier
   // is invoked.
   scoped_ptr<AutocompleteClassifier> autocomplete_classifier_;
 
-  // The WebDataService.  Only created if CreateWebDataService is invoked.
-  scoped_refptr<WebDataService> web_data_service_;
-
   // Internally, this is a TestURLRequestContextGetter that creates a dummy
   // request context. Currently, only the CookieMonster is hooked up.
   scoped_refptr<net::URLRequestContextGetter> request_context_;
   scoped_refptr<net::URLRequestContextGetter> extensions_request_context_;
 
   std::wstring id_;
 
   bool incognito_;
   scoped_ptr<Profile> incognito_profile_;
 
@@ skipping 29 matching lines @@
   // testing.
   ProfileDependencyManager* profile_dependency_manager_;
 
   scoped_ptr<content::MockResourceContext> resource_context_;
 
   // Weak pointer to a delegate for indicating that a profile was created.
   Delegate* delegate_;
 };
 
 #endif  // CHROME_TEST_BASE_TESTING_PROFILE_H_