Fifth patch in getting rid of caching MessageLoop pointers.

chrome/browser/importer/importer.cc

 // Copyright (c) 2009 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/importer/importer.h"
 
 #include "app/gfx/favicon_size.h"
 #include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_instance.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
@@ skipping 361 matching lines @@
   return true;
 }
 
 // ImporterHost.
 
 ImporterHost::ImporterHost()
     : profile_(NULL),
       observer_(NULL),
       task_(NULL),
       importer_(NULL),
-      file_loop_(g_browser_process->file_thread()->message_loop()),
       waiting_for_bookmarkbar_model_(false),
       installed_bookmark_observer_(false),
       is_source_readable_(true),
       headless_(false),
       parent_window_(NULL) {
   importer_list_.DetectSourceProfiles();
 }
 
-ImporterHost::ImporterHost(MessageLoop* file_loop)
-    : profile_(NULL),
-      observer_(NULL),
-      task_(NULL),
-      importer_(NULL),
-      file_loop_(file_loop),
-      waiting_for_bookmarkbar_model_(false),
-      installed_bookmark_observer_(false),
-      is_source_readable_(true),
-      headless_(false),
-      parent_window_(NULL) {
-  importer_list_.DetectSourceProfiles();
-}
-
 ImporterHost::~ImporterHost() {
   if (NULL != importer_)
     importer_->Release();
   if (installed_bookmark_observer_) {
     DCHECK(profile_);  // Only way for waiting_for_bookmarkbar_model_ to be true
                        // is if we have a profile.
     profile_->GetBookmarkModel()->RemoveObserver(this);
   }
 }
 
@@ skipping 80 matching lines @@
   importer_->AddRef();
 
   bool import_to_bookmark_bar = first_run;
   if (target_profile && target_profile->GetBookmarkModel()->IsLoaded()) {
     std::vector<GURL> starred_urls;
     target_profile->GetBookmarkModel()->GetBookmarks(&starred_urls);
     import_to_bookmark_bar = (starred_urls.size() == 0);
   }
   importer_->set_import_to_bookmark_bar(import_to_bookmark_bar);
   scoped_refptr<ImporterBridge> bridge(
-      new InProcessImporterBridge(writer_.get(), file_loop_, this));
+      new InProcessImporterBridge(writer_.get(), this));
   task_ = NewRunnableMethod(importer_, &Importer::StartImport,
       profile_info, items, bridge);
 
   // We should lock the Firefox profile directory to prevent corruption.
   if (profile_info.browser_type == FIREFOX2 ||
       profile_info.browser_type == FIREFOX3) {
     firefox_lock_.reset(new FirefoxProfileLock(profile_info.source_path));
     if (!firefox_lock_->HasAcquired()) {
       // If fail to acquire the lock, we set the source unreadable and
       // show a warning dialog.
@@ skipping 67 matching lines @@
 }
 
 void ImporterHost::SetObserver(Observer* observer) {
   observer_ = observer;
 }
 
 void ImporterHost::InvokeTaskIfDone() {
   if (waiting_for_bookmarkbar_model_ || !registrar_.IsEmpty() ||
       !is_source_readable_)
     return;
-  file_loop_->PostTask(FROM_HERE, task_);
+  ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE, task_);
 }
 
 void ImporterHost::ImportItemStarted(ImportItem item) {
   if (observer_)
     observer_->ImportItemStarted(item);
 }
 
 void ImporterHost::ImportItemEnded(ImportItem item) {
   if (observer_)
     observer_->ImportItemEnded(item);
 }
 
 void ImporterHost::ImportStarted() {
   if (observer_)
     observer_->ImportStarted();
 }
 
 void ImporterHost::ImportEnded() {
   firefox_lock_.reset();  // Release the Firefox profile lock.
   if (observer_)
     observer_->ImportEnded();
   Release();
 }