Fifth patch in getting rid of caching MessageLoop pointers.

chrome/browser/importer/toolbar_importer.cc

 // Copyright (c) 2006-2008 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/toolbar_importer.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/rand_util.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/common/libxml_utils.h"
 #include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/data_url.h"
 #include "net/url_request/url_request_context.h"
 
 //
@@ skipping 84 matching lines @@
 // as well as an internal callback in case of cancel.  An internal callback
 // is required since the URLFetcher must be destroyed from the thread it was
 // created.
 void Toolbar5Importer::Cancel() {
   // In the case when the thread is not importing messages we are to
   // cancel as soon as possible.
   Importer::Cancel();
 
   // If we are conducting network operations, post a message to the importer
   // thread for synchronization.
-  if (NULL != bridge_->delegate_loop_) {
-    if (bridge_->delegate_loop_ != MessageLoop::current()) {
-      bridge_->delegate_loop_->PostTask(
-          FROM_HERE,
-          NewRunnableMethod(this, &Toolbar5Importer::Cancel));
-    } else {
-      EndImport();
-    }
+  if (ChromeThread::CurrentlyOn(ChromeThread::UI)) {
+    EndImport();
+  } else {
+    ChromeThread::PostTask(
+        ChromeThread::UI, FROM_HERE,
+        NewRunnableMethod(this, &Toolbar5Importer::Cancel));
   }
 }
 
 void Toolbar5Importer::OnURLFetchComplete(
     const URLFetcher* source,
     const GURL& url,
     const URLRequestStatus& status,
     int response_code,
     const ResponseCookies& cookies,
     const std::string& data) {
@@ skipping 444 matching lines @@
 void  Toolbar5Importer::AddBookmarksToChrome(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
   if (!bookmarks.empty() && !cancelled()) {
     const std::wstring& first_folder_name =
         l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
     int options = ProfileWriter::ADD_IF_UNIQUE |
         (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0);
     bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);
   }
 }