Third patch in getting rid of caching MessageLoop pointers and always using ChromeThread instead.

BUG=25354

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

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

4 files changed, 19 insertions, 12 deletions

diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index 3d3a972..0883b31 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -6,7 +6,7 @@
 
 #include "base/string_util.h"
 #include "base/thread.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_thread.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
@@ -96,10 +96,8 @@ JobTracker::~JobTracker() {
 
 // main thread:
 void JobTracker::InvokeOnIOThread(void (JobTracker::*m)()) {
-  base::Thread* thread = g_browser_process->io_thread();
-  if (!thread)
-    return;
-  thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(this, m));
+  ChromeThread::PostTask(
+      ChromeThread::IO, FROM_HERE, NewRunnableMethod(this, m));
 }
 
 // main thread:
diff --git a/chrome/browser/views/bookmark_context_menu_test.cc b/chrome/browser/views/bookmark_context_menu_test.cc
index 97e222f..b33745b 100644
--- a/chrome/browser/views/bookmark_context_menu_test.cc
+++ b/chrome/browser/views/bookmark_context_menu_test.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/views/bookmark_context_menu.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
@@ -37,7 +38,9 @@ class TestingPageNavigator : public PageNavigator {
 class BookmarkContextMenuTest : public testing::Test {
  public:
   BookmarkContextMenuTest()
-      : model_(NULL) {
+      : ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_),
+        model_(NULL) {
   }
 
   virtual void SetUp() {
@@ -66,6 +69,8 @@ class BookmarkContextMenuTest : public testing::Test {
 
  protected:
   MessageLoopForUI message_loop_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
   scoped_ptr<TestingProfile> profile_;
   BookmarkModel* model_;
   TestingPageNavigator navigator_;
diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc
index 9e2ae40..a43a928 100644
--- a/chrome/browser/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/views/bookmark_editor_view_unittest.cc
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/common/pref_names.h"
@@ -18,7 +20,10 @@ using base::TimeDelta;
 // it with test data.
 class BookmarkEditorViewTest : public testing::Test {
  public:
-  BookmarkEditorViewTest() : model_(NULL) {
+  BookmarkEditorViewTest()
+      : model_(NULL),
+        ui_thread_(ChromeThread::UI, &message_loop_),
+        file_thread_(ChromeThread::FILE, &message_loop_) {
   }
 
   virtual void SetUp() {
@@ -27,6 +32,7 @@ class BookmarkEditorViewTest : public testing::Test {
     profile_->CreateBookmarkModel(true);
 
     model_ = profile_->GetBookmarkModel();
+    profile_->BlockUntilBookmarkModelLoaded();
 
     AddTestData();
   }
@@ -117,6 +123,8 @@ class BookmarkEditorViewTest : public testing::Test {
   }
 
   scoped_ptr<BookmarkEditorView> editor_;
+  ChromeThread ui_thread_;
+  ChromeThread file_thread_;
 };
 
 // Makes sure the tree model matches that of the bookmark bar model.
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 5cb0375..978eb43 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -604,11 +604,7 @@ void BookmarkManagerView::FileSelected(const FilePath& path,
                          profile_info, profile_,
                          new ImportObserverImpl(profile()), false);
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
-    if (g_browser_process->io_thread()) {
-      bookmark_html_writer::WriteBookmarks(
-          g_browser_process->io_thread()->message_loop(), GetBookmarkModel(),
-          path);
-    }
+    bookmark_html_writer::WriteBookmarks(GetBookmarkModel(), path);
   } else {
     NOTREACHED();
   }