Converting BookmarkModel and HistoryService to ProfileKeyedServices. This just performs the initial…

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 14 matching lines @@
 namespace net {
 class CookieMonster;
 class URLRequestContextGetter;
 }
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
 class AutocompleteClassifier;
-class BookmarkModel;
 class CommandLine;
 class ExtensionPrefs;
 class ExtensionSpecialStoragePolicy;
 class FaviconService;
-class HistoryService;
 class HostContentSettingsMap;
 class PrefService;
 class ProfileDependencyManager;
 class ProfileSyncService;
 class TemplateURLService;
 class TestingPrefService;
 
 class TestingProfile : public Profile {
  public:
   // Default constructor that cannot be used with multi-profiles.
@@ skipping 212 matching lines @@
 
   // 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 AutocompleteClassifier.  Only created if CreateAutocompleteClassifier
   // is invoked.
   scoped_ptr<AutocompleteClassifier> autocomplete_classifier_;
 
   // The policy service. Lazily created as a stub.
   scoped_ptr<policy::PolicyService> policy_service_;
@@ skipping 37 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_