Revert 74292 - Splits ChromeURLDataManager into 2 chunks:...

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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 "chrome/browser/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chrome_blob_storage_context.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/file_system/browser_file_system_helper.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
@@ skipping 593 matching lines @@
   }
 
   virtual ExtensionInfoMap* GetExtensionInfoMap() {
     return profile_->GetExtensionInfoMap();
   }
 
   virtual policy::ProfilePolicyContext* GetPolicyContext() {
     return NULL;
   }
 
-  virtual ChromeURLDataManager* GetChromeURLDataManager() {
-    if (!chrome_url_data_manager_.get())
-      chrome_url_data_manager_.reset(new ChromeURLDataManager(this));
-    return chrome_url_data_manager_.get();
-  }
-
   virtual PromoCounter* GetInstantPromoCounter() {
     return NULL;
   }
 
 #if defined(OS_CHROMEOS)
   virtual void ChangeAppLocale(const std::string& locale, AppLocaleChangedVia) {
   }
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() {
@@ skipping 69 matching lines @@
   // Tracks all BackgroundContents running under this profile.
   scoped_ptr<BackgroundContentsService> background_contents_service_;
 
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   // The file_system context for this profile.
   scoped_refptr<fileapi::SandboxedFileSystemContext> file_system_context_;
 
   scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
-  scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 #if defined(OS_CHROMEOS)
 // Special case of the OffTheRecordProfileImpl which is used while Guest
 // session in CrOS.
 class GuestSessionProfile : public OffTheRecordProfileImpl {
  public:
   explicit GuestSessionProfile(Profile* real_profile)
       : OffTheRecordProfileImpl(real_profile) {
   }
 
   virtual PersonalDataManager* GetPersonalDataManager() {
     return GetOriginalProfile()->GetPersonalDataManager();
   }
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }