Move 2 manager references in BrowserProcessImpl to .cc file

Don't need to #include these headers in our header, we can move them to the .cc file.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/7973002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101996 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 7 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 86b42f9..84f1a34 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -52,6 +52,7 @@
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
+#include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/web_resource/gpu_blacklist_updater.h"
 #include "chrome/common/chrome_constants.h"
@@ -72,6 +73,7 @@
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/download/download_file_manager.h"
+#include "content/browser/download/download_status_updater.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
@@ -148,7 +150,9 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
-      using_new_frames_(false) {
+      using_new_frames_(false),
+      thumbnail_generator_(new ThumbnailGenerator),
+      download_status_updater_(new DownloadStatusUpdater) {
   g_browser_process = this;
   clipboard_.reset(new ui::Clipboard);
 
@@ -536,7 +540,7 @@ IconManager* BrowserProcessImpl::icon_manager() {
 }
 
 ThumbnailGenerator* BrowserProcessImpl::GetThumbnailGenerator() {
-  return &thumbnail_generator_;
+  return thumbnail_generator_.get();
 }
 
 AutomationProviderList* BrowserProcessImpl::GetAutomationProviderList() {
@@ -616,7 +620,7 @@ void BrowserProcessImpl::SetApplicationLocale(const std::string& locale) {
 }
 
 DownloadStatusUpdater* BrowserProcessImpl::download_status_updater() {
-  return &download_status_updater_;
+  return download_status_updater_.get();
 }
 
 DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index fab1ac8..24ac16b 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -21,8 +21,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/tab_contents/thumbnail_generator.h"
-#include "content/browser/download/download_status_updater.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ipc/ipc_message.h"
@@ -269,12 +267,12 @@ class BrowserProcessImpl : public BrowserProcess,
 
   // This service just sits around and makes thumbnails for tabs. It does
   // nothing in the constructor so we don't have to worry about lazy init.
-  ThumbnailGenerator thumbnail_generator_;
+  scoped_ptr<ThumbnailGenerator> thumbnail_generator_;
 
   // Download status updates (like a changing application icon on dock/taskbar)
   // are global per-application. DownloadStatusUpdater does no work in the ctor
   // so we don't have to worry about lazy initialization.
-  DownloadStatusUpdater download_status_updater_;
+  scoped_ptr<DownloadStatusUpdater> download_status_updater_;
 
   scoped_refptr<DownloadRequestLimiter> download_request_limiter_;