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

chrome/test/base/testing_profile.h

Index: chrome/test/base/testing_profile.h
===================================================================
--- chrome/test/base/testing_profile.h	(revision 137731)
+++ chrome/test/base/testing_profile.h	(working copy)
@@ -33,12 +33,10 @@
 }
 
 class AutocompleteClassifier;
-class BookmarkModel;
 class CommandLine;
 class ExtensionPrefs;
 class ExtensionSpecialStoragePolicy;
 class FaviconService;
-class HistoryService;
 class HostContentSettingsMap;
 class PrefService;
 class ProfileDependencyManager;
@@ -269,12 +267,6 @@
   // 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_;