diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 19:34:00 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 19:34:00 +0000 |
commit | 166f2ed8f748b4b910db4b20b7f5d35ef41e209c (patch) | |
tree | c9ab93eac521aee1577db71616205137339bf381 /remoting/host | |
parent | 030a4809dc6fbb95753fb11faa99bc07c8eb1f6f (diff) | |
download | chromium_src-166f2ed8f748b4b910db4b20b7f5d35ef41e209c.zip chromium_src-166f2ed8f748b4b910db4b20b7f5d35ef41e209c.tar.gz chromium_src-166f2ed8f748b4b910db4b20b7f5d35ef41e209c.tar.bz2 |
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
Diffstat (limited to 'remoting/host')
-rw-r--r-- | remoting/host/config_file_watcher_unittest.cc | 5 | ||||
-rw-r--r-- | remoting/host/desktop_process_main.cc | 2 | ||||
-rw-r--r-- | remoting/host/desktop_process_unittest.cc | 5 | ||||
-rw-r--r-- | remoting/host/ipc_desktop_environment_unittest.cc | 5 | ||||
-rw-r--r-- | remoting/host/remoting_me2me_host.cc | 2 | ||||
-rw-r--r-- | remoting/host/win/chromoting_module.cc | 2 | ||||
-rw-r--r-- | remoting/host/win/host_service.cc | 4 | ||||
-rw-r--r-- | remoting/host/win/rdp_client_unittest.cc | 5 |
8 files changed, 13 insertions, 17 deletions
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() { |