diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 04:33:17 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 04:33:17 +0000 |
| commit | f9d8a772bb120d9e4a311c8fb72553d3356a6a3a (patch) | |
| tree | 3e9cfc6461e6df6d318774a5fabf82ab05dbad27 /remoting/host/ipc_desktop_environment_unittest.cc | |
| parent | 83501baf7d4e148982f9068fbca4379ccf983540 (diff) | |
| download | chromium_src-f9d8a772bb120d9e4a311c8fb72553d3356a6a3a.zip chromium_src-f9d8a772bb120d9e4a311c8fb72553d3356a6a3a.tar.gz chromium_src-f9d8a772bb120d9e4a311c8fb72553d3356a6a3a.tar.bz2 | |
Update remoting/ and jingle/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15782010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/ipc_desktop_environment_unittest.cc')
| -rw-r--r-- | remoting/host/ipc_desktop_environment_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc index 25b47d5..7c18610 100644 --- a/remoting/host/ipc_desktop_environment_unittest.cc +++ b/remoting/host/ipc_desktop_environment_unittest.cc @@ -364,16 +364,16 @@ void IpcDesktopEnvironmentTest::ReflectClipboardEvent( } void IpcDesktopEnvironmentTest::CreateDesktopProcess() { - EXPECT_TRUE(task_runner_); - EXPECT_TRUE(io_task_runner_); + EXPECT_TRUE(task_runner_.get()); + EXPECT_TRUE(io_task_runner_.get()); // Create the daemon end of the daemon-to-desktop channel. desktop_channel_name_ = IPC::Channel::GenerateUniqueRandomChannelID(); - desktop_channel_.reset(new IPC::ChannelProxy( - IPC::ChannelHandle(desktop_channel_name_), - IPC::Channel::MODE_SERVER, - &desktop_listener_, - io_task_runner_)); + desktop_channel_.reset( + new IPC::ChannelProxy(IPC::ChannelHandle(desktop_channel_name_), + IPC::Channel::MODE_SERVER, + &desktop_listener_, + io_task_runner_.get())); // Create and start the desktop process. desktop_process_.reset(new DesktopProcess(task_runner_, |