Simplify threading in browser thread by making only ChromeThread deal with di...

chrome/browser/user_data_manager.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 "build/build_config.h"
 
 #include "chrome/browser/user_data_manager.h"
 
 #include <string>
 
@@ skipping 192 matching lines @@
 
 void UserDataManager::LaunchChromeForProfile(int index) const {
   // Helper deletes itself when done.
   LaunchChromeForProfileIndexHelper* helper =
       new LaunchChromeForProfileIndexHelper(this, index);
   helper->StartLaunch();
 }
 
 void UserDataManager::GetProfiles(std::vector<std::wstring>* profiles) const {
   // This function should be called on the file thread.
-  DCHECK(MessageLoop::current() ==
-      ChromeThread::GetMessageLoop(ChromeThread::FILE));
+  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
   file_util::FileEnumerator file_enum(
       FilePath::FromWStringHack(user_data_root_),
       false, file_util::FileEnumerator::DIRECTORIES);
   std::wstring folder_name;
   while (!(folder_name = file_enum.Next().ToWStringHack()).empty()) {
     folder_name = file_util::GetFilenameFromPath(folder_name);
     std::wstring profile_name;
     if (GetProfileNameFromFolderName(folder_name, &profile_name))
       profiles->push_back(profile_name);
   }
@@ skipping 49 matching lines @@
 void GetProfilesHelper::GetProfiles(MessageLoop* target_loop) {
   // If the target loop is not NULL then use the target loop, or if it's NULL
   // then use the current message loop to post a task on it later when we are
   // done building a list of profiles.
   if (target_loop) {
     message_loop_ = target_loop;
   } else {
     message_loop_ = MessageLoop::current();
   }
   DCHECK(message_loop_);
-  MessageLoop* file_loop = ChromeThread::GetMessageLoop(ChromeThread::FILE);
-  file_loop->PostTask(
-      FROM_HERE,
+  ChromeThread::PostTask(
+      ChromeThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &GetProfilesHelper::GetProfilesFromManager));
 }
 
 // Records that the delegate is closed.
 void GetProfilesHelper::OnDelegateDeleted() {
   delegate_ = NULL;
 }
 
 void GetProfilesHelper::GetProfilesFromManager() {
   // This function should be called on the file thread.
-  DCHECK(MessageLoop::current() ==
-      ChromeThread::GetMessageLoop(ChromeThread::FILE));
+  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
 
   // If the delegate is gone by now, no need to do any work.
   if (!delegate_)
     return;
 
   scoped_ptr< std::vector<std::wstring> > profiles(
       new std::vector<std::wstring>);
   UserDataManager::Get()->GetProfiles(profiles.get());
 
   // Post a task on the original thread to call the delegate.
   message_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &GetProfilesHelper::InvokeDelegate,
                         profiles.release()));
 }
 
 void GetProfilesHelper::InvokeDelegate(std::vector<std::wstring>* profiles) {
   scoped_ptr< std::vector<std::wstring> > udd_profiles(profiles);
   // If the delegate is gone by now, no need to do any work.
   if (delegate_)
     delegate_->OnGetProfilesDone(*udd_profiles.get());
 }