Removes MessageLoop::TYPE_XXX where possible

This is part of attempting to get rid of MessageLoop::Type enum.

BUG=none
TEST=none
R=darin@chromium.org

Review URL: https://codereview.chromium.org/136683004

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

20 files changed, 43 insertions, 55 deletions

diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index bd80739..825bbe0 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -148,7 +148,6 @@ class LoginUtilsTest : public testing::Test,
   LoginUtilsTest()
       : fake_io_thread_completion_(false, false),
         fake_io_thread_("fake_io_thread"),
-        loop_(base::MessageLoop::TYPE_IO),
         browser_process_(TestingBrowserProcess::GetGlobal()),
         local_state_(browser_process_),
         ui_thread_(BrowserThread::UI, &loop_),
@@ -455,7 +454,7 @@ class LoginUtilsTest : public testing::Test,
   base::WaitableEvent fake_io_thread_completion_;
   base::Thread fake_io_thread_;
 
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
   TestingBrowserProcess* browser_process_;
   ScopedTestingLocalState local_state_;
 
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
index f3e9941..d0bc463 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
@@ -282,7 +282,7 @@ class QueryProtocolHandlerOnChange
 // our type based on the current thread. GO DEPENDENCY INJECTION!
 class TestMessageLoop : public base::MessageLoop {
  public:
-  TestMessageLoop() : base::MessageLoop(base::MessageLoop::TYPE_DEFAULT) {}
+  TestMessageLoop() {}
   virtual ~TestMessageLoop() {}
   virtual bool IsType(base::MessageLoop::Type type) const OVERRIDE {
     switch (type) {
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index b350afc..05c9d62 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
@@ -32,7 +32,7 @@ namespace keys = declarative_webrequest_constants;
 
 TEST(WebRequestConditionAttributeTest, CreateConditionAttribute) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
@@ -73,7 +73,7 @@ TEST(WebRequestConditionAttributeTest, CreateConditionAttribute) {
 
 TEST(WebRequestConditionAttributeTest, ResourceType) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   std::string error;
   base::ListValue resource_types;
@@ -106,7 +106,7 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
 
 TEST(WebRequestConditionAttributeTest, ContentType) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
@@ -177,7 +177,7 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
 // Testing WebRequestConditionAttributeThirdParty.
 TEST(WebRequestConditionAttributeTest, ThirdParty) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   std::string error;
   const FundamentalValue value_true(true);
@@ -239,7 +239,7 @@ TEST(WebRequestConditionAttributeTest, ThirdParty) {
 // applicable in all stages.
 TEST(WebRequestConditionAttributeTest, Stages) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   typedef std::pair<RequestStage, const char*> StageNamePair;
   static const StageNamePair active_stages[] = {
@@ -418,7 +418,7 @@ void MatchAndCheck(const std::vector< std::vector<const std::string*> >& tests,
 // by both types of condition attributes, so it is enough to test it once.
 TEST(WebRequestConditionAttributeTest, RequestHeaders) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
@@ -498,7 +498,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
 // 3. Negating the match in case of 'doesNotContainHeaders'.
 TEST(WebRequestConditionAttributeTest, ResponseHeaders) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   net::SpawnedTestServer test_server(
       net::SpawnedTestServer::TYPE_HTTP,
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
index d49a32d..63c9e1b 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
@@ -23,7 +23,7 @@ namespace extensions {
 
 TEST(WebRequestConditionTest, CreateCondition) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   URLMatcher matcher;
 
   std::string error;
@@ -101,7 +101,7 @@ TEST(WebRequestConditionTest, CreateCondition) {
 
 TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   URLMatcher matcher;
 
   std::string error;
@@ -147,7 +147,7 @@ TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) {
 //      always fulfilled.
 TEST(WebRequestConditionTest, NoUrlAttributes) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   URLMatcher matcher;
   std::string error;
 
@@ -220,7 +220,7 @@ TEST(WebRequestConditionTest, NoUrlAttributes) {
 
 TEST(WebRequestConditionTest, CreateConditionSet) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   URLMatcher matcher;
 
   WebRequestConditionSet::AnyVector conditions;
@@ -289,7 +289,7 @@ TEST(WebRequestConditionTest, CreateConditionSet) {
 
 TEST(WebRequestConditionTest, TestPortFilter) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   URLMatcher matcher;
 
   WebRequestConditionSet::AnyVector conditions;
@@ -349,7 +349,7 @@ TEST(WebRequestConditionTest, TestPortFilter) {
 // impossible that both conditions are fulfilled at the same time.
 TEST(WebRequestConditionTest, ConditionsWithConflictingStages) {
   // Necessary for TestURLRequest.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
   URLMatcher matcher;
 
   std::string error;
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
index 41a143a..7ef5524 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -81,8 +81,7 @@ class TestWebRequestRulesRegistry : public WebRequestRulesRegistry {
 class WebRequestRulesRegistryTest : public testing::Test {
  public:
   WebRequestRulesRegistryTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        ui_(content::BrowserThread::UI, &message_loop_),
+      : ui_(content::BrowserThread::UI, &message_loop_),
         io_(content::BrowserThread::IO, &message_loop_) {}
 
   virtual ~WebRequestRulesRegistryTest() {}
@@ -223,7 +222,7 @@ class WebRequestRulesRegistryTest : public testing::Test {
   }
 
  protected:
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   content::TestBrowserThread ui_;
   content::TestBrowserThread io_;
   // Two extensions with host permissions for all URLs and the DWR permission.
diff --git a/chrome/browser/extensions/api/dial/dial_service_unittest.cc b/chrome/browser/extensions/api/dial/dial_service_unittest.cc
index 02d5e09..e282a57 100644
--- a/chrome/browser/extensions/api/dial/dial_service_unittest.cc
+++ b/chrome/browser/extensions/api/dial/dial_service_unittest.cc
@@ -57,7 +57,7 @@ class DialServiceTest : public testing::Test {
 };
 
 TEST_F(DialServiceTest, TestSendMultipleRequests) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO loop;
   // Setting the finish delay to zero disables the timer that invokes
   // FinishDiscovery().
   dial_service_.finish_delay_ = TimeDelta::FromSeconds(0);
@@ -74,7 +74,7 @@ TEST_F(DialServiceTest, TestSendMultipleRequests) {
 }
 
 TEST_F(DialServiceTest, TestMultipleNetworkInterfaces) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO loop;
   // Setting the finish delay to zero disables the timer that invokes
   // FinishDiscovery().
   dial_service_.finish_delay_ = TimeDelta::FromSeconds(0);
diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc
index 1032d37..d86e08f 100644
--- a/chrome/browser/extensions/default_apps_unittest.cc
+++ b/chrome/browser/extensions/default_apps_unittest.cc
@@ -29,11 +29,10 @@ class MockExternalLoader : public ExternalLoader {
 
 class DefaultAppsTest : public testing::Test {
  public:
-  DefaultAppsTest() : loop_(base::MessageLoop::TYPE_IO),
-      ui_thread_(content::BrowserThread::UI, &loop_) {}
+  DefaultAppsTest() : ui_thread_(content::BrowserThread::UI, &loop_) {}
   virtual ~DefaultAppsTest() {}
  private:
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
   content::TestBrowserThread ui_thread_;
 };
 
diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc
index 8f70dba..de36941 100644
--- a/chrome/browser/extensions/external_policy_loader_unittest.cc
+++ b/chrome/browser/extensions/external_policy_loader_unittest.cc
@@ -26,9 +26,7 @@ namespace extensions {
 
 class ExternalPolicyLoaderTest : public testing::Test {
  public:
-  ExternalPolicyLoaderTest()
-      : loop_(base::MessageLoop::TYPE_IO),
-        ui_thread_(BrowserThread::UI, &loop_) {
+  ExternalPolicyLoaderTest() : ui_thread_(BrowserThread::UI, &loop_) {
   }
 
   virtual ~ExternalPolicyLoaderTest() {}
@@ -36,7 +34,7 @@ class ExternalPolicyLoaderTest : public testing::Test {
  private:
   // We need these to satisfy BrowserThread::CurrentlyOn(BrowserThread::UI)
   // checks in ExternalProviderImpl.
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
   content::TestBrowserThread ui_thread_;
 };
 
diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc
index 8e77ac1..8b447a7 100644
--- a/chrome/browser/importer/profile_writer_unittest.cc
+++ b/chrome/browser/importer/profile_writer_unittest.cc
@@ -34,8 +34,7 @@ class TestProfileWriter : public ProfileWriter {
 class ProfileWriterTest : public testing::Test {
  public:
   ProfileWriterTest()
-      : loop_(base::MessageLoop::TYPE_DEFAULT),
-        ui_thread_(BrowserThread::UI, &loop_),
+      : ui_thread_(BrowserThread::UI, &loop_),
         file_thread_(BrowserThread::FILE, &loop_) {
   }
   virtual ~ProfileWriterTest() {}
diff --git a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc
index 04e924b..f0de8dc 100644
--- a/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc
+++ b/chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc
@@ -185,21 +185,21 @@ TEST(ChromeFraudulentCertificateReporterTest, GoodBadInfo) {
 }
 
 TEST(ChromeFraudulentCertificateReporterTest, ReportIsSent) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO loop;
   content::TestBrowserThread io_thread(BrowserThread::IO, &loop);
   loop.PostTask(FROM_HERE, base::Bind(&DoReportIsSent));
   loop.RunUntilIdle();
 }
 
 TEST(ChromeFraudulentCertificateReporterTest, MockReportIsSent) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO loop;
   content::TestBrowserThread io_thread(BrowserThread::IO, &loop);
   loop.PostTask(FROM_HERE, base::Bind(&DoMockReportIsSent));
   loop.RunUntilIdle();
 }
 
 TEST(ChromeFraudulentCertificateReporterTest, ReportIsNotSent) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO loop;
   content::TestBrowserThread io_thread(BrowserThread::IO, &loop);
   loop.PostTask(FROM_HERE, base::Bind(&DoReportIsNotSent));
   loop.RunUntilIdle();
diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc
index 812c692..6239c2b 100644
--- a/chrome/browser/net/connection_tester_unittest.cc
+++ b/chrome/browser/net/connection_tester_unittest.cc
@@ -89,8 +89,7 @@ class ConnectionTesterDelegate : public ConnectionTester::Delegate {
 class ConnectionTesterTest : public PlatformTest {
  public:
   ConnectionTesterTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        io_thread_(BrowserThread::IO, &message_loop_),
+      : io_thread_(BrowserThread::IO, &message_loop_),
         test_server_(net::SpawnedTestServer::TYPE_HTTP,
                      net::SpawnedTestServer::kLocalhost,
                      // Nothing is read in this directory.
@@ -105,7 +104,7 @@ class ConnectionTesterTest : public PlatformTest {
   // SSLClientAuthCache calls RemoveObserver when destroyed, but if the
   // MessageLoop is already destroyed, then the RemoveObserver will be a
   // no-op, and the ObserverList will contain invalid entries.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   content::TestBrowserThread io_thread_;
   net::SpawnedTestServer test_server_;
   ConnectionTesterDelegate test_delegate_;
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc
index 4329cbd..cc66528 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -84,7 +84,7 @@ class TestingURLBlacklistManager : public URLBlacklistManager {
 
 class URLBlacklistManagerTest : public testing::Test {
  protected:
-  URLBlacklistManagerTest() : loop_(base::MessageLoop::TYPE_IO) {}
+  URLBlacklistManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     pref_service_.registry()->RegisterListPref(policy_prefs::kUrlBlacklist);
@@ -102,7 +102,7 @@ class URLBlacklistManagerTest : public testing::Test {
     blacklist_manager_.reset();
   }
 
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
   TestingPrefServiceSimple pref_service_;
   scoped_ptr<TestingURLBlacklistManager> blacklist_manager_;
 };
diff --git a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc
index fe75dd1..4cc47bd 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc
+++ b/chrome/browser/predictors/autocomplete_action_predictor_table_unittest.cc
@@ -71,8 +71,7 @@ class AutocompleteActionPredictorTableReopenTest
 };
 
 AutocompleteActionPredictorTableTest::AutocompleteActionPredictorTableTest()
-    : loop_(base::MessageLoop::TYPE_DEFAULT),
-      db_thread_(BrowserThread::DB, &loop_) {
+    : db_thread_(BrowserThread::DB, &loop_) {
 }
 
 AutocompleteActionPredictorTableTest::~AutocompleteActionPredictorTableTest() {
diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
index 13d681c..1fbe21d 100644
--- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
+++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc
@@ -83,8 +83,7 @@ namespace predictors {
 class AutocompleteActionPredictorTest : public testing::Test {
  public:
   AutocompleteActionPredictorTest()
-      : loop_(base::MessageLoop::TYPE_DEFAULT),
-        ui_thread_(BrowserThread::UI, &loop_),
+      : ui_thread_(BrowserThread::UI, &loop_),
         db_thread_(BrowserThread::DB, &loop_),
         file_thread_(BrowserThread::FILE, &loop_),
         profile_(new TestingProfile()),
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index 08f204a..91312aa 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -181,7 +181,7 @@ class ConfigParserTest : public testing::Test {
 
   MOCK_METHOD0(Callback, void(void));
 
-  base::MessageLoop loop_;
+  base::MessageLoopForIO loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   URLFetcherRequestListener request_listener_;
@@ -189,8 +189,7 @@ class ConfigParserTest : public testing::Test {
 };
 
 ConfigParserTest::ConfigParserTest()
-    : loop_(base::MessageLoop::TYPE_IO),
-      ui_thread_(content::BrowserThread::UI, &loop_),
+    : ui_thread_(content::BrowserThread::UI, &loop_),
       io_thread_(content::BrowserThread::IO, &loop_),
       factory_(NULL, base::Bind(&ConfigParserTest::CreateFakeURLFetcher,
                                 base::Unretained(this))) {
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index a99fde6..5eb5b0c 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -395,7 +395,7 @@ TEST_F(SafeBrowsingDatabaseTest, ListNameForBrowse) {
 
 TEST_F(SafeBrowsingDatabaseTest, ListNameForBrowseAndDownload) {
   database_.reset();
-  base::MessageLoop loop(base::MessageLoop::TYPE_DEFAULT);
+  base::MessageLoop loop;
   SafeBrowsingStoreFile* browse_store = new SafeBrowsingStoreFile();
   SafeBrowsingStoreFile* download_store = new SafeBrowsingStoreFile();
   SafeBrowsingStoreFile* csd_whitelist_store = new SafeBrowsingStoreFile();
@@ -1123,7 +1123,7 @@ TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) {
   // influence task-posting.  Database specifically needs to the
   // file-backed.
   database_.reset();
-  base::MessageLoop loop(base::MessageLoop::TYPE_DEFAULT);
+  base::MessageLoop loop;
   SafeBrowsingStoreFile* store = new SafeBrowsingStoreFile();
   database_.reset(new SafeBrowsingDatabaseNew(store, NULL, NULL, NULL, NULL,
                                               NULL, NULL));
@@ -1192,7 +1192,7 @@ TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) {
 // Checks database reading and writing.
 TEST_F(SafeBrowsingDatabaseTest, ContainsDownloadUrl) {
   database_.reset();
-  base::MessageLoop loop(base::MessageLoop::TYPE_DEFAULT);
+  base::MessageLoop loop;
   SafeBrowsingStoreFile* browse_store = new SafeBrowsingStoreFile();
   SafeBrowsingStoreFile* download_store = new SafeBrowsingStoreFile();
   SafeBrowsingStoreFile* csd_whitelist_store = new SafeBrowsingStoreFile();
diff --git a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc
index bd434e5..2a00597 100644
--- a/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_host_metrics_unittest.cc
@@ -20,7 +20,7 @@
 
 class SpellcheckHostMetricsTest : public testing::Test {
  public:
-  SpellcheckHostMetricsTest() : loop_(base::MessageLoop::TYPE_DEFAULT) {
+  SpellcheckHostMetricsTest() {
   }
 
   static void SetUpTestCase() {
diff --git a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
index b7fe420..2171858 100644
--- a/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
+++ b/chrome/browser/sync_file_system/local/local_file_change_tracker_unittest.cc
@@ -34,8 +34,7 @@ namespace sync_file_system {
 class LocalFileChangeTrackerTest : public testing::Test {
  public:
   LocalFileChangeTrackerTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        file_system_(GURL("http://example.com"),
+      : file_system_(GURL("http://example.com"),
                      base::MessageLoopProxy::current().get(),
                      base::MessageLoopProxy::current().get()) {}
 
@@ -106,7 +105,7 @@ class LocalFileChangeTrackerTest : public testing::Test {
   }
 
   ScopedEnableSyncFSDirectoryOperation enable_directory_operation_;
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   CannedSyncableFileSystem file_system_;
 
  private:
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc
index c1af3fb..42f6974 100644
--- a/chrome/browser/themes/theme_syncable_service_unittest.cc
+++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -168,8 +168,7 @@ scoped_refptr<extensions::Extension> MakeThemeExtension(
 class ThemeSyncableServiceTest : public testing::Test {
  protected:
   ThemeSyncableServiceTest()
-      : loop_(base::MessageLoop::TYPE_DEFAULT),
-        ui_thread_(content::BrowserThread::UI, &loop_),
+      : ui_thread_(content::BrowserThread::UI, &loop_),
         file_thread_(content::BrowserThread::FILE, &loop_),
         fake_theme_service_(NULL) {}
 
diff --git a/chrome/renderer/media/chrome_webrtc_log_message_delegate_unittest.cc b/chrome/renderer/media/chrome_webrtc_log_message_delegate_unittest.cc
index 9955011..3df3362 100644
--- a/chrome/renderer/media/chrome_webrtc_log_message_delegate_unittest.cc
+++ b/chrome/renderer/media/chrome_webrtc_log_message_delegate_unittest.cc
@@ -13,7 +13,7 @@
 TEST(ChromeWebRtcLogMessageDelegateTest, Basic) {
   const char kTestString[] = "abcdefghijklmnopqrstuvwxyz";
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
+  base::MessageLoopForIO message_loop;
 
   scoped_refptr<MockWebRtcLoggingMessageFilter> log_message_filter(
       new MockWebRtcLoggingMessageFilter(message_loop.message_loop_proxy()));