Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

chrome/browser/profiles/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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "chrome/browser/net/preconnect.h" // TODO: remove this.
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
 #include "content/public/browser/browser_context.h"
 
 class AutocompleteClassifier;
 class BookmarkModel;
 class ChromeAppCacheService;
 class ChromeURLDataManager;
 class Extension;
 class ExtensionEventRouter;
 class ExtensionProcessManager;
 class ExtensionService;
@@ skipping 313 matching lines @@
   virtual void InitPromoResources() = 0;
 
   // Register URLRequestFactories for protocols registered with
   // registerProtocolHandler.
   virtual void InitRegisteredProtocolHandlers() = 0;
 
   // Returns the last directory that was chosen for uploading or opening a file.
   virtual FilePath last_selected_directory() = 0;
   virtual void set_last_selected_directory(const FilePath& path) = 0;
 
-  // Returns the ChromeURLDataManager for this profile.
-  virtual ChromeURLDataManager* GetChromeURLDataManager() = 0;
-
 #if defined(OS_CHROMEOS)
   enum AppLocaleChangedVia {
     // Caused by chrome://settings change.
     APP_LOCALE_CHANGED_VIA_SETTINGS,
     // Locale has been reverted via LocaleChangeGuard.
     APP_LOCALE_CHANGED_VIA_REVERT,
     // From login screen.
     APP_LOCALE_CHANGED_VIA_LOGIN,
     // Source unknown.
     APP_LOCALE_CHANGED_VIA_UNKNOWN
@@ skipping 70 matching lines @@
   }
 
   // Checks whether sync is configurable by the user. Returns false if sync is
   // disabled or controlled by configuration management.
   bool IsSyncAccessible();
 
   // Creates an OffTheRecordProfile which points to this Profile.
   Profile* CreateOffTheRecordProfile();
 
  protected:
+  // TODO(erg, willchan): Remove friendship once |ProfileIOData| is made into
+  //     a |ProfileKeyedService|.
+  friend class ChromeURLDataManagerFactory;
   friend class OffTheRecordProfileImpl;
 
+  // Returns a callback to a method returning a |ChromeURLDataManagerBackend|.
+  // Used to create a |ChromeURLDataManager| for this |Profile|.
+  // TODO(erg, willchan): Remove this once |ProfileIOData| is made into a
+  //     |ProfileKeyedService|.
+  virtual base::Callback<ChromeURLDataManagerBackend*(void)>
+      GetChromeURLDataManagerBackendGetter() const = 0;
+
   static net::URLRequestContextGetter* default_request_context_;
 
  private:
   // ***DEPRECATED**: You should be passing in the specific profile's
   // URLRequestContextGetter or using the system URLRequestContextGetter.
   //
   // Returns the request context for the "default" profile.  This may be called
   // from any thread.  This CAN return NULL if a first request context has not
   // yet been created.  If necessary, listen on the UI thread for
   // NOTIFY_DEFAULT_REQUEST_CONTEXT_AVAILABLE.
@@ skipping 15 matching lines @@
 struct hash<Profile*> {
   std::size_t operator()(Profile* const& p) const {
     return reinterpret_cast<std::size_t>(p);
   }
 };
 
 }  // namespace BASE_HASH_NAMESPACE
 #endif
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_H_