MessageLoop(TYPE_UI) -> MessageLoopForUI

Converts creation of MessageLoopForUI from MessageLoop(TYPE_UI) to
MessageLoopForUI.

This is a step in the direction of moving type out of MessageLoop.

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

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

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

54 files changed, 78 insertions, 102 deletions

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index b300780..c018d1e 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -37,7 +37,7 @@ void AwBrowserMainParts::PreEarlyInitialization() {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop. Also see MainMessageLoopRun.
   DCHECK(!main_message_loop_.get());
-  main_message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  main_message_loop_.reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 }
 
diff --git a/chrome/browser/autofill/risk/fingerprint_browsertest.cc b/chrome/browser/autofill/risk/fingerprint_browsertest.cc
index 1149f2d..db1b66a 100644
--- a/chrome/browser/autofill/risk/fingerprint_browsertest.cc
+++ b/chrome/browser/autofill/risk/fingerprint_browsertest.cc
@@ -65,8 +65,7 @@ class AutofillRiskFingerprintTest : public InProcessBrowserTest {
         content_bounds_(11, 13, 17, 37),
         screen_bounds_(0, 0, 101, 71),
         available_screen_bounds_(0, 11, 101, 60),
-        unavailable_screen_bounds_(0, 0, 101, 11),
-        message_loop_(base::MessageLoop::TYPE_UI) {}
+        unavailable_screen_bounds_(0, 0, 101, 11) {}
 
   void GetFingerprintTestCallback(scoped_ptr<Fingerprint> fingerprint) {
     // Verify that all fields Chrome can fill have been filled.
@@ -167,7 +166,7 @@ class AutofillRiskFingerprintTest : public InProcessBrowserTest {
   const gfx::Rect unavailable_screen_bounds_;
 
   // A message loop to block on the asynchronous loading of the fingerprint.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
 };
 
 // Test that getting a fingerprint works on some basic level.
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc
index 61d6818..4dfa359 100644
--- a/chrome/browser/chrome_browser_main_android.cc
+++ b/chrome/browser/chrome_browser_main_android.cc
@@ -69,7 +69,7 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {
   {
     TRACE_EVENT0("startup",
       "ChromeBrowserMainPartsAndroid::PreEarlyInitialization:CreateUiMsgLoop");
-    main_message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+    main_message_loop_.reset(new base::MessageLoopForUI);
   }
 
   {
diff --git a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
index 31037da..61fa81f 100644
--- a/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/attestation/attestation_policy_observer_unittest.cc
@@ -79,8 +79,7 @@ class FakeDBusData {
 class AttestationPolicyObserverTest : public ::testing::Test {
  public:
   AttestationPolicyObserverTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(content::BrowserThread::UI, &message_loop_) {
+      : ui_thread_(content::BrowserThread::UI, &message_loop_) {
     // Remove the real DeviceSettingsProvider and replace it with a stub.
     CrosSettings* cros_settings = CrosSettings::Get();
     device_settings_provider_ =
@@ -167,7 +166,7 @@ class AttestationPolicyObserverTest : public ::testing::Test {
     return serialized;
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   ScopedTestDeviceSettingsService test_device_settings_service_;
   ScopedTestCrosSettings test_cros_settings_;
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
index a46081d..acbae50 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_flow_unittest.cc
@@ -121,8 +121,7 @@ class CustomFakeCryptohomeClient : public FakeCryptohomeClient {
 class PlatformVerificationFlowTest : public ::testing::Test {
  public:
   PlatformVerificationFlowTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(content::BrowserThread::UI, &message_loop_),
+      : ui_thread_(content::BrowserThread::UI, &message_loop_),
         certificate_success_(true),
         fake_certificate_index_(0),
         sign_challenge_success_(true),
@@ -306,7 +305,7 @@ class PlatformVerificationFlowTest : public ::testing::Test {
   }
 
  protected:
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   StrictMock<MockAttestationFlow> mock_attestation_flow_;
   cryptohome::MockAsyncMethodCaller mock_async_caller_;
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc
index 679fa0f..587aacf 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings_unittest.cc
@@ -26,8 +26,7 @@ namespace chromeos {
 class KioskModeSettingsTest : public testing::Test {
  protected:
   KioskModeSettingsTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(content::BrowserThread::UI, &message_loop_),
+      : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_) {
     CrosSettings* cros_settings = CrosSettings::Get();
 
@@ -70,7 +69,7 @@ class KioskModeSettingsTest : public testing::Test {
     KioskModeSettings::Get()->set_initialized(false);
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
diff --git a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
index e0a9ba0..d26c1b1 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc
@@ -45,7 +45,6 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
       : auto_login_user_id_(policy::GenerateDeviceLocalAccountUserId(
             kAutoLoginAccountId,
             policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
-        message_loop_(base::MessageLoop::TYPE_UI),
         ui_thread_(content::BrowserThread::UI, &message_loop_),
         local_state_(TestingBrowserProcess::GetGlobal()),
         mock_user_manager_(new MockUserManager()),
@@ -150,7 +149,7 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {
   MockLoginDisplay* mock_login_display_;
 
   scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   ScopedTestingLocalState local_state_;
 
diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
index 2deb4d0..00fa4c9 100644
--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
@@ -149,8 +149,7 @@ namespace policy {
 class DeviceStatusCollectorTest : public testing::Test {
  public:
   DeviceStatusCollectorTest()
-    : message_loop_(base::MessageLoop::TYPE_UI),
-      ui_thread_(content::BrowserThread::UI, &message_loop_),
+    : ui_thread_(content::BrowserThread::UI, &message_loop_),
       file_thread_(content::BrowserThread::FILE, &message_loop_),
       io_thread_(content::BrowserThread::IO, &message_loop_),
       user_manager_(new chromeos::MockUserManager()),
@@ -257,7 +256,7 @@ class DeviceStatusCollectorTest : public testing::Test {
   // Since this is a unit test running in browser_tests we must do additional
   // unit test setup and make a TestingBrowserProcess. Must be first member.
   TestingBrowserProcessInitializer initializer_;
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
index 61f5f57..9e8deba 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
@@ -51,8 +51,7 @@ ACTION_P2(SendSanitizedUsername, call_status, sanitized_username) {
 
 class UserCloudPolicyStoreChromeOSTest : public testing::Test {
  protected:
-  UserCloudPolicyStoreChromeOSTest()
-      : loop_(base::MessageLoop::TYPE_UI) {}
+  UserCloudPolicyStoreChromeOSTest() {}
 
   virtual void SetUp() OVERRIDE {
     EXPECT_CALL(cryptohome_client_,
@@ -220,7 +219,7 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test {
     return tmp_dir_.path().AppendASCII("policy");
   }
 
-  base::MessageLoop loop_;
+  base::MessageLoopForUI loop_;
   chromeos::MockCryptohomeClient cryptohome_client_;
   chromeos::MockSessionManagerClient session_manager_client_;
   UserPolicyBuilder policy_;
diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc
index fd24ce8..d328b58 100644
--- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc
+++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc
@@ -30,8 +30,7 @@ namespace chromeos {
 class CrosSettingsTest : public testing::Test {
  protected:
   CrosSettingsTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(content::BrowserThread::UI, &message_loop_),
+      : ui_thread_(content::BrowserThread::UI, &message_loop_),
         local_state_(TestingBrowserProcess::GetGlobal()),
         settings_(DeviceSettingsService::Get()),
         weak_factory_(this) {}
@@ -89,7 +88,7 @@ class CrosSettingsTest : public testing::Test {
     response.set_policy_data_signature("false");
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
 
   ScopedTestingLocalState local_state_;
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index f79d4bf..b14499a 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -196,8 +196,7 @@ ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
-    : loop_(base::MessageLoop::TYPE_UI),
-      ui_thread_(content::BrowserThread::UI, &loop_),
+    : ui_thread_(content::BrowserThread::UI, &loop_),
       file_thread_(content::BrowserThread::FILE, &loop_),
       owner_key_util_(new MockOwnerKeyUtil()) {}
 
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 9111672..d235721 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -168,7 +168,7 @@ class DeviceSettingsTestBase : public testing::Test {
   // |device_settings_service_| and flushes the resulting load operation.
   void ReloadDeviceSettings();
 
-  base::MessageLoop loop_;
+  base::MessageLoopForUI loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
diff --git a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
index 9f4e078..dc2cccd 100644
--- a/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
+++ b/chrome/browser/extensions/api/system_memory/system_memory_apitest.cc
@@ -30,7 +30,7 @@ class SystemMemoryApiTest: public ExtensionApiTest {
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
-    message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+    message_loop_.reset(new base::MessageLoopForUI);
   }
 
  private:
diff --git a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
index 4ce92d3..960c380 100644
--- a/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
+++ b/chrome/browser/extensions/api/system_storage/system_storage_apitest.cc
@@ -75,7 +75,7 @@ class SystemStorageApiTest : public ExtensionApiTest {
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
-    message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+    message_loop_.reset(new base::MessageLoopForUI);
   }
 
   void SetUpAllMockStorageDevices() {
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index dc55c56..585edd74 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -39,9 +39,7 @@ namespace extensions {
 class UserScriptMasterTest : public testing::Test,
                              public content::NotificationObserver {
  public:
-  UserScriptMasterTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        shared_memory_(NULL) {
+  UserScriptMasterTest() : shared_memory_(NULL) {
   }
 
   virtual void SetUp() {
@@ -80,7 +78,7 @@ class UserScriptMasterTest : public testing::Test,
   content::NotificationRegistrar registrar_;
 
   // MessageLoop used in tests.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
 
   scoped_ptr<content::TestBrowserThread> file_thread_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc
index 9fd46b2..d725fc4 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc
@@ -220,7 +220,7 @@ void DataReductionProxySettingsTestBase::CheckOnPrefChange(
 void DataReductionProxySettingsTestBase::CheckInitDataReductionProxy(
     bool enabled_at_startup) {
   AddProxyToCommandLine();
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   pref_service_.SetBoolean(prefs::kSpdyProxyAuthEnabled, enabled_at_startup);
   SetProbeResult(
       kProbeURLWithOKResponse, "OK", true, enabled_at_startup ? 1 : 0);
@@ -477,7 +477,7 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
       settings_->GetOriginalProfilePrefs());
 
   // TODO(bengr): Test enabling/disabling while a probe is outstanding.
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   // The proxy is enabled and unrestructed initially.
   // Request succeeded but with bad response, expect proxy to be restricted.
   CheckProbe(true, kProbeURLWithBadResponse, "Bad", true, true, true);
@@ -492,7 +492,7 @@ TEST_F(DataReductionProxySettingsTest, TestMaybeActivateDataReductionProxy) {
 
 TEST_F(DataReductionProxySettingsTest, TestOnIPAddressChanged) {
   AddProxyToCommandLine();
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   // The proxy is enabled initially.
   settings_->enabled_by_user_ = true;
   settings_->restricted_by_carrier_ = false;
@@ -511,7 +511,7 @@ TEST_F(DataReductionProxySettingsTest, TestOnIPAddressChanged) {
 TEST_F(DataReductionProxySettingsTest, TestOnProxyEnabledPrefChange) {
   AddProxyToCommandLine();
   settings_->InitPrefMembers();
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   // The proxy is enabled initially.
   settings_->enabled_by_user_ = true;
   settings_->SetProxyConfigs(true, false, true);
diff --git a/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc b/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc
index 1363c4a..6692c81 100644
--- a/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc
+++ b/chrome/browser/spellchecker/spellcheck_platform_mac_unittest.cc
@@ -18,8 +18,7 @@ class SpellcheckMacTest: public testing::Test {
   SpellcheckMacTest()
       : callback_(base::Bind(&SpellcheckMacTest::CompletionCallback,
                              base::Unretained(this))),
-        callback_finished_(false),
-        message_loop_(base::MessageLoop::TYPE_UI) {}
+        callback_finished_(false) {}
 
   void WaitForCallback() {
     content::RunMessageLoop();
@@ -43,7 +42,7 @@ class SpellcheckMacTest: public testing::Test {
                                       base::Unretained(this)));
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   spellcheck_mac::ScopedEnglishLanguageForTest scoped_language_;
 };
 
diff --git a/chrome/browser/sync/glue/generic_change_processor_unittest.cc b/chrome/browser/sync/glue/generic_change_processor_unittest.cc
index 966906f..f10a9fb 100644
--- a/chrome/browser/sync/glue/generic_change_processor_unittest.cc
+++ b/chrome/browser/sync/glue/generic_change_processor_unittest.cc
@@ -31,7 +31,6 @@ class SyncGenericChangeProcessorTest : public testing::Test {
   static const syncer::ModelType kType = syncer::PREFERENCES;
 
   SyncGenericChangeProcessorTest() :
-      loop_(base::MessageLoop::TYPE_UI),
       sync_merge_result_(kType),
       merge_result_ptr_factory_(&sync_merge_result_),
       syncable_service_ptr_factory_(&fake_syncable_service_) {
@@ -78,7 +77,7 @@ class SyncGenericChangeProcessorTest : public testing::Test {
   }
 
  private:
-  base::MessageLoop loop_;
+  base::MessageLoopForUI loop_;
 
   syncer::SyncMergeResult sync_merge_result_;
   base::WeakPtrFactory<syncer::SyncMergeResult> merge_result_ptr_factory_;
diff --git a/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc b/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc
index 8ac68e7..8c08d8f 100644
--- a/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc
+++ b/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc
@@ -23,7 +23,7 @@ class PanelMouseWatcherTest : public testing::Test {
 };
 
 TEST_F(PanelMouseWatcherTest, StartStopWatching) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
 
   scoped_ptr<PanelMouseWatcher> watcher(PanelMouseWatcher::Create());
   EXPECT_FALSE(watcher->IsActive());
diff --git a/chrome/browser/ui/webui/fileicon_source_unittest.cc b/chrome/browser/ui/webui/fileicon_source_unittest.cc
index 2c08098..bd5b555 100644
--- a/chrome/browser/ui/webui/fileicon_source_unittest.cc
+++ b/chrome/browser/ui/webui/fileicon_source_unittest.cc
@@ -32,8 +32,7 @@ class TestFileIconSource : public FileIconSource {
 class FileIconSourceTest : public testing::Test {
  public:
   FileIconSourceTest()
-      : loop_(base::MessageLoop::TYPE_UI),
-        ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
+      : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
         file_thread_(BrowserThread::FILE, base::MessageLoop::current()) {}
 
   static TestFileIconSource* CreateFileIconSource() {
@@ -41,7 +40,7 @@ class FileIconSourceTest : public testing::Test {
   }
 
  private:
-  base::MessageLoop loop_;
+  base::MessageLoopForUI loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 };
diff --git a/components/dom_distiller/core/distiller_unittest.cc b/components/dom_distiller/core/distiller_unittest.cc
index 3784fd5..44c2986 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -124,7 +124,7 @@ ACTION_P2(CreateMockDistillerPage, list, kurl) {
 }
 
 TEST_F(DistillerTest, DistillPage) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   scoped_ptr<base::ListValue> list(new base::ListValue());
   list->AppendString(kTitle);
   list->AppendString(kContent);
diff --git a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
index de5f45b..0f27452 100644
--- a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
+++ b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
@@ -45,7 +45,7 @@ class DistillerURLFetcherTest : public testing::Test {
 
   void Fetch(const std::string& url,
              const std::string& expected_response) {
-    base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+    base::MessageLoopForUI loop;
     url_fetcher_->FetchURL(
         url,
         base::Bind(&DistillerURLFetcherTest::FetcherCallback,
diff --git a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
index c2302d7..c0e165e 100644
--- a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
@@ -32,8 +32,7 @@ ACTION_P(CheckStatus, expected_status) {
 class CloudPolicyValidatorTest : public testing::Test {
  public:
   CloudPolicyValidatorTest()
-      : loop_(base::MessageLoop::TYPE_UI),
-        timestamp_(base::Time::UnixEpoch() +
+      : timestamp_(base::Time::UnixEpoch() +
                    base::TimeDelta::FromMilliseconds(
                        PolicyBuilder::kFakeTimestamp)),
         timestamp_option_(CloudPolicyValidatorBase::TIMESTAMP_REQUIRED),
@@ -89,7 +88,7 @@ class CloudPolicyValidatorTest : public testing::Test {
               validator->payload()->SerializeAsString());
   }
 
-  base::MessageLoop loop_;
+  base::MessageLoopForUI loop_;
   base::Time timestamp_;
   CloudPolicyValidatorBase::ValidateTimestampOption timestamp_option_;
   CloudPolicyValidatorBase::ValidateDMTokenOption ignore_missing_dm_token_;
diff --git a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
index 0220251..c7378c7 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
@@ -34,7 +34,7 @@ void RunUntilIdle() {
 
 class UserCloudPolicyStoreTest : public testing::Test {
  public:
-  UserCloudPolicyStoreTest() : loop_(base::MessageLoop::TYPE_UI) {}
+  UserCloudPolicyStoreTest() {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
@@ -89,7 +89,7 @@ class UserCloudPolicyStoreTest : public testing::Test {
   // CloudPolicyValidator() requires a FILE thread so declare one here. Both
   // |ui_thread_| and |file_thread_| share the same MessageLoop |loop_| so
   // callers can use RunLoop to manage both virtual threads.
-  base::MessageLoop loop_;
+  base::MessageLoopForUI loop_;
 
   base::ScopedTempDir tmp_dir_;
 
diff --git a/content/browser/aura/software_browser_compositor_output_surface_unittest.cc b/content/browser/aura/software_browser_compositor_output_surface_unittest.cc
index 1d05295..14312d2 100644
--- a/content/browser/aura/software_browser_compositor_output_surface_unittest.cc
+++ b/content/browser/aura/software_browser_compositor_output_surface_unittest.cc
@@ -81,7 +81,7 @@ class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test {
 SoftwareBrowserCompositorOutputSurfaceTest::
     SoftwareBrowserCompositorOutputSurfaceTest() {
   CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
-  message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  message_loop_.reset(new base::MessageLoopForUI);
 }
 
 SoftwareBrowserCompositorOutputSurfaceTest::
diff --git a/content/browser/aura/software_output_device_ozone_unittest.cc b/content/browser/aura/software_output_device_ozone_unittest.cc
index 6469995f..2dfbda6 100644
--- a/content/browser/aura/software_output_device_ozone_unittest.cc
+++ b/content/browser/aura/software_output_device_ozone_unittest.cc
@@ -81,7 +81,7 @@ class SoftwareOutputDeviceOzoneTest : public testing::Test {
 
 SoftwareOutputDeviceOzoneTest::SoftwareOutputDeviceOzoneTest() {
   CHECK(gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL));
-  message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  message_loop_.reset(new base::MessageLoopForUI);
 }
 
 SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 9b4a1ef..b293a48 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -433,7 +433,7 @@ void BrowserMainLoop::MainMessageLoopStart() {
 
   // Create a MessageLoop if one does not already exist for the current thread.
   if (!base::MessageLoop::current())
-    main_message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+    main_message_loop_.reset(new base::MessageLoopForUI);
 
   InitializeMainThread();
 
diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm
index 0993018..fa1894f 100644
--- a/content/browser/renderer_host/text_input_client_mac_unittest.mm
+++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm
@@ -35,8 +35,7 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
 class TextInputClientMacTest : public testing::Test {
  public:
   TextInputClientMacTest()
-      : message_loop_(base::MessageLoop::TYPE_UI),
-        browser_context_(),
+      : browser_context_(),
         process_factory_(),
         delegate_(),
         widget_(&delegate_,
@@ -74,7 +73,7 @@ class TextInputClientMacTest : public testing::Test {
  private:
   friend class ScopedTestingThread;
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   TestBrowserContext browser_context_;
 
   // Gets deleted when the last RWH in the "process" gets destroyed.
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index e55d235..63dc5f9 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -52,7 +52,7 @@ int PluginMain(const MainFunctionParams& parameters) {
 #endif
   InitializeChromeApplication();
 #endif
-  base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI main_message_loop;
   base::PlatformThread::SetName("CrPluginMain");
   base::debug::TraceLog::GetInstance()->SetProcessName("Plugin Process");
   base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
diff --git a/content/renderer/device_orientation/device_motion_event_pump_unittest.cc b/content/renderer/device_orientation/device_motion_event_pump_unittest.cc
index 6cb78b6..09bf34d 100644
--- a/content/renderer/device_orientation/device_motion_event_pump_unittest.cc
+++ b/content/renderer/device_orientation/device_motion_event_pump_unittest.cc
@@ -57,7 +57,7 @@ class DeviceMotionEventPumpForTesting : public DeviceMotionEventPump {
 #define MAYBE_DidStartPolling DidStartPolling
 #endif
 TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPolling) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   scoped_ptr<MockDeviceMotionListener> listener(new MockDeviceMotionListener);
   scoped_ptr<DeviceMotionEventPumpForTesting> motion_pump(
       new DeviceMotionEventPumpForTesting);
@@ -114,7 +114,7 @@ TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPolling) {
     DidStartPollingNotAllSensorsActive
 #endif
 TEST_F(DeviceMotionEventPumpTest, MAYBE_DidStartPollingNotAllSensorsActive) {
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   scoped_ptr<MockDeviceMotionListener> listener(new MockDeviceMotionListener);
   scoped_ptr<DeviceMotionEventPumpForTesting> motion_pump(
       new DeviceMotionEventPumpForTesting);
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 63c72ae..06e7262 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -160,7 +160,7 @@ int RendererMain(const MainFunctionParams& parameters) {
 #if defined(OS_MACOSX)
   // As long as we use Cocoa in the renderer (for the forseeable future as of
   // now; see http://crbug.com/306348 for info) we need to have a UI loop.
-  base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI main_message_loop;
 #else
   // The main message loop of the renderer services doesn't have IO or UI tasks,
   // unless in-process-plugins is used.
diff --git a/media/base/user_input_monitor_unittest.cc b/media/base/user_input_monitor_unittest.cc
index 4874a10..1afde601 100644
--- a/media/base/user_input_monitor_unittest.cc
+++ b/media/base/user_input_monitor_unittest.cc
@@ -49,7 +49,7 @@ TEST(UserInputMonitorTest, CreatePlatformSpecific) {
 #if defined(OS_LINUX)
   base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
 #else
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
 #endif  // defined(OS_LINUX)
 
   base::RunLoop run_loop;
diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc
index d39ab82..9e7ad78 100644
--- a/mojo/services/native_viewport/native_viewport_service.cc
+++ b/mojo/services/native_viewport/native_viewport_service.cc
@@ -182,7 +182,7 @@ extern "C" MOJO_NATIVE_VIEWPORT_EXPORT MojoResult MojoMain(
   mojo::common::BindingsSupportImpl bindings_support_impl;
   mojo::BindingsSupport::Set(&bindings_support_impl);
 
-  base::MessageLoop loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI loop;
   mojo::services::NativeViewportService app(
       mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass());
   base::MessageLoop::current()->Run();
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc
index 64de60f..00e8246 100644
--- a/mojo/shell/android/mojo_main.cc
+++ b/mojo/shell/android/mojo_main.cc
@@ -67,8 +67,7 @@ static void Init(JNIEnv* env, jclass clazz, jobject context) {
   CommandLine::Init(0, 0);
   mojo::shell::InitializeLogging();
 
-  g_java_message_loop.Get().reset(
-      new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
   // TODO(abarth): At which point should we switch to cross-platform
diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc
index 29980b4..67b2e56 100644
--- a/remoting/host/config_file_watcher_unittest.cc
+++ b/remoting/host/config_file_watcher_unittest.cc
@@ -49,7 +49,7 @@ class ConfigFileWatcherTest : public testing::Test {
   void StopWatcher();
 
  protected:
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   base::RunLoop run_loop_;
 
   ConfigFileWatcherDelegate delegate_;
@@ -61,8 +61,7 @@ class ConfigFileWatcherTest : public testing::Test {
   scoped_ptr<ConfigFileWatcher> watcher_;
 };
 
-ConfigFileWatcherTest::ConfigFileWatcherTest()
-    : message_loop_(base::MessageLoop::TYPE_UI) {
+ConfigFileWatcherTest::ConfigFileWatcherTest() {
 }
 
 ConfigFileWatcherTest::~ConfigFileWatcherTest() {
diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc
index 294413c..5147168 100644
--- a/remoting/host/desktop_process_main.cc
+++ b/remoting/host/desktop_process_main.cc
@@ -30,7 +30,7 @@ int DesktopProcessMain() {
   if (channel_name.empty())
     return kUsageExitCode;
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
   base::RunLoop run_loop;
   scoped_refptr<AutoThreadTaskRunner> ui_task_runner =
       new AutoThreadTaskRunner(message_loop.message_loop_proxy(),
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index c2d72c2..d83d803 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -144,7 +144,7 @@ class DesktopProcessTest : public testing::Test {
   MockDaemonListener daemon_listener_;
 
   // Runs the daemon's end of the channel.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
 
   scoped_refptr<AutoThreadTaskRunner> io_task_runner_;
 
@@ -155,8 +155,7 @@ class DesktopProcessTest : public testing::Test {
   MockNetworkListener network_listener_;
 };
 
-DesktopProcessTest::DesktopProcessTest()
-    : message_loop_(base::MessageLoop::TYPE_UI) {}
+DesktopProcessTest::DesktopProcessTest() {}
 
 DesktopProcessTest::~DesktopProcessTest() {
 }
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index 52c5e7f..5bea812 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -160,7 +160,7 @@ class IpcDesktopEnvironmentTest : public testing::Test {
   void OnDesktopAttached(IPC::PlatformFileForTransit desktop_pipe);
 
   // The main message loop.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
 
   // Runs until |desktop_session_proxy_| is connected to the desktop.
   scoped_ptr<base::RunLoop> setup_run_loop_;
@@ -215,8 +215,7 @@ class IpcDesktopEnvironmentTest : public testing::Test {
 };
 
 IpcDesktopEnvironmentTest::IpcDesktopEnvironmentTest()
-    : message_loop_(base::MessageLoop::TYPE_UI),
-      client_jid_("user@domain/rest-of-jid"),
+    : client_jid_("user@domain/rest-of-jid"),
       clipboard_stub_(NULL),
       remote_input_injector_(NULL),
       terminal_id_(-1),
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 7a0faba..21473ee 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -1157,7 +1157,7 @@ int HostProcessMain() {
   media::InitializeCPUSpecificMediaFeatures();
 
   // Create the main message loop and start helper threads.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
   scoped_ptr<ChromotingHostContext> context =
       ChromotingHostContext::Create(new AutoThreadTaskRunner(
           message_loop.message_loop_proxy(), base::MessageLoop::QuitClosure()));
diff --git a/remoting/host/win/chromoting_module.cc b/remoting/host/win/chromoting_module.cc
index 630c6c2..0e9f6b6 100644
--- a/remoting/host/win/chromoting_module.cc
+++ b/remoting/host/win/chromoting_module.cc
@@ -132,7 +132,7 @@ bool ChromotingModule::Run() {
   }
 
   // Arrange to run |message_loop| until no components depend on it.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
   base::RunLoop run_loop;
   g_module_task_runner.Get() = new AutoThreadTaskRunner(
       message_loop.message_loop_proxy(), run_loop.QuitClosure());
diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc
index 989873ea..1c7e199 100644
--- a/remoting/host/win/host_service.cc
+++ b/remoting/host/win/host_service.cc
@@ -238,7 +238,7 @@ int HostService::RunAsService() {
 }
 
 void HostService::RunAsServiceImpl() {
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
   base::RunLoop run_loop;
   main_task_runner_ = message_loop.message_loop_proxy();
   weak_ptr_ = weak_factory_.GetWeakPtr();
@@ -296,7 +296,7 @@ void HostService::RunAsServiceImpl() {
 }
 
 int HostService::RunInConsole() {
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
   base::RunLoop run_loop;
   main_task_runner_ = message_loop.message_loop_proxy();
   weak_ptr_ = weak_factory_.GetWeakPtr();
diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc
index de755e4..ac541a1 100644
--- a/remoting/host/win/rdp_client_unittest.cc
+++ b/remoting/host/win/rdp_client_unittest.cc
@@ -96,7 +96,7 @@ class RdpClientTest : public testing::Test {
 
   // The UI message loop used by RdpClient. The loop is stopped once there is no
   // more references to |task_runner_|.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   base::RunLoop run_loop_;
   scoped_refptr<AutoThreadTaskRunner> task_runner_;
 
@@ -110,8 +110,7 @@ class RdpClientTest : public testing::Test {
   std::string terminal_id_;
 };
 
-RdpClientTest::RdpClientTest()
-    : message_loop_(base::MessageLoop::TYPE_UI) {
+RdpClientTest::RdpClientTest() {
 }
 
 RdpClientTest::~RdpClientTest() {
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 326aaad..203cf3a 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -299,7 +299,7 @@ int main(int argc, char** argv) {
   base::i18n::InitializeICU();
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
   aura::Env::CreateInstance();
   scoped_ptr<aura::TestScreen> test_screen(
       aura::TestScreen::CreateFullscreen());
diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
index 4c991e1..0bc1f54 100644
--- a/ui/aura/demo/demo_main.cc
+++ b/ui/aura/demo/demo_main.cc
@@ -107,7 +107,7 @@ class DemoWindowTreeClient : public aura::client::WindowTreeClient {
 
 int DemoMain() {
   // Create the message-loop here before creating the root window.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
 
   // The ContextFactory must exist before any Compositors are created.
   bool allow_test_contexts = false;
diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm
index 3e3af1c..d3fa777 100644
--- a/ui/base/cocoa/menu_controller_unittest.mm
+++ b/ui/base/cocoa/menu_controller_unittest.mm
@@ -349,7 +349,7 @@ TEST_F(MenuControllerTest, Dynamic) {
 TEST_F(MenuControllerTest, OpenClose) {
   // SimpleMenuModel posts a task that calls Delegate::MenuClosed. Create
   // a MessageLoop for that purpose.
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
 
   // Create the model.
   Delegate delegate;
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index b811bfd..b9253ec 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -40,7 +40,7 @@ void CompositorTestSuite::Initialize() {
   gfx::InitDeviceScaleFactor(1.0f);
 #endif
 
-  message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  message_loop_.reset(new base::MessageLoopForUI);
 }
 
 void CompositorTestSuite::Shutdown() {
diff --git a/ui/events/ozone/evdev/touch_event_converter_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_unittest.cc
index d99ab72..b5d6847 100644
--- a/ui/events/ozone/evdev/touch_event_converter_unittest.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_unittest.cc
@@ -106,7 +106,7 @@ class TouchEventConverterEvdevTest : public testing::Test {
 
   // Overridden from testing::Test:
   virtual void SetUp() OVERRIDE {
-    loop_ = new base::MessageLoop(base::MessageLoop::TYPE_UI);
+    loop_ = new base::MessageLoopForUI;
     device_ = new ui::MockTouchEventConverterEvdev(-1, 2);
     base::MessagePumpOzone::Current()->AddDispatcherForRootWindow(device_);
   }
diff --git a/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc b/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
index 2e70f64..55ae6cd 100644
--- a/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
+++ b/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
@@ -211,7 +211,7 @@ class DriSurfaceFactoryTest : public testing::Test {
 };
 
 void DriSurfaceFactoryTest::SetUp() {
-  message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  message_loop_.reset(new base::MessageLoopForUI);
   factory_.reset(new MockDriSurfaceFactory());
 }
 
diff --git a/ui/message_center/cocoa/popup_collection_unittest.mm b/ui/message_center/cocoa/popup_collection_unittest.mm
index 4a853da..8ea2ff1 100644
--- a/ui/message_center/cocoa/popup_collection_unittest.mm
+++ b/ui/message_center/cocoa/popup_collection_unittest.mm
@@ -21,8 +21,7 @@ namespace message_center {
 
 class PopupCollectionTest : public ui::CocoaTest {
  public:
-  PopupCollectionTest()
-    : message_loop_(base::MessageLoop::TYPE_UI) {
+  PopupCollectionTest() {
     message_center::MessageCenter::Initialize();
     center_ = message_center::MessageCenter::Get();
     collection_.reset(
@@ -109,7 +108,7 @@ class PopupCollectionTest : public ui::CocoaTest {
     nested_run_loop_.reset();
   }
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   scoped_ptr<base::RunLoop> nested_run_loop_;
   message_center::MessageCenter* center_;
   base::scoped_nsobject<MCPopupCollection> collection_;
diff --git a/ui/message_center/cocoa/tray_view_controller_unittest.mm b/ui/message_center/cocoa/tray_view_controller_unittest.mm
index fe2399d..c3dd79a 100644
--- a/ui/message_center/cocoa/tray_view_controller_unittest.mm
+++ b/ui/message_center/cocoa/tray_view_controller_unittest.mm
@@ -21,8 +21,7 @@ namespace message_center {
 class TrayViewControllerTest : public ui::CocoaTest {
  public:
   TrayViewControllerTest()
-    : center_(NULL),
-      message_loop_(base::MessageLoop::TYPE_UI) {
+    : center_(NULL) {
   }
 
   virtual void SetUp() OVERRIDE {
@@ -61,7 +60,7 @@ class TrayViewControllerTest : public ui::CocoaTest {
 
   message_center::MessageCenter* center_;  // Weak, global.
 
-  base::MessageLoop message_loop_;
+  base::MessageLoopForUI message_loop_;
   scoped_ptr<base::RunLoop> nested_run_loop_;
   base::scoped_nsobject<MCTrayViewController> tray_;
 };
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 28864c4..dc8b7ac 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -11,7 +11,7 @@ int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   CommandLine::Init(argc, argv);
 
-  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI message_loop;
 
   base::RunLoop().Run();
 
diff --git a/win8/metro_driver/chrome_app_view.cc b/win8/metro_driver/chrome_app_view.cc
index 79bd584..2bc555b 100644
--- a/win8/metro_driver/chrome_app_view.cc
+++ b/win8/metro_driver/chrome_app_view.cc
@@ -819,7 +819,7 @@ ChromeAppView::Run() {
   }
 
   // Create a message loop to allow message passing into this thread.
-  base::MessageLoop msg_loop(base::MessageLoop::TYPE_UI);
+  base::MessageLoopForUI msg_loop;
 
   // Announce our message loop to the world.
   globals.appview_msg_loop = msg_loop.message_loop_proxy();
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 08673de..848c4eb 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -496,8 +496,7 @@ class ChromeAppViewAsh::PointerInfoHandler {
 ChromeAppViewAsh::ChromeAppViewAsh()
     : mouse_down_flags_(ui::EF_NONE),
       ui_channel_(nullptr),
-      core_window_hwnd_(NULL),
-      ui_loop_(base::MessageLoop::TYPE_UI) {
+      core_window_hwnd_(NULL) {
   DVLOG(1) << __FUNCTION__;
   globals.previous_state =
       winapp::Activation::ApplicationExecutionState_NotRunning;
diff --git a/win8/metro_driver/chrome_app_view_ash.h b/win8/metro_driver/chrome_app_view_ash.h
index 4b439c2..ed07796 100644
--- a/win8/metro_driver/chrome_app_view_ash.h
+++ b/win8/metro_driver/chrome_app_view_ash.h
@@ -218,7 +218,7 @@ class ChromeAppViewAsh
   HWND core_window_hwnd_;
 
   // UI message loop to allow message passing into this thread.
-  base::MessageLoop ui_loop_;
+  base::MessageLoopForUI ui_loop_;
 
   // For IME support.
   scoped_ptr<metro_driver::InputSource> input_source_;