diff options
| author | tzik <tzik@chromium.org> | 2016-02-10 10:30:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 18:32:00 +0000 |
| commit | 651fa1249144a42032c20e4e82f87e995f5d7dff (patch) | |
| tree | acc0c325f26ca1124b019422291a4be66d3432fc /remoting/host | |
| parent | a3a30cc274921b9124e92ac01a107c11874bda37 (diff) | |
| download | chromium_src-651fa1249144a42032c20e4e82f87e995f5d7dff.zip chromium_src-651fa1249144a42032c20e4e82f87e995f5d7dff.tar.gz chromium_src-651fa1249144a42032c20e4e82f87e995f5d7dff.tar.bz2 | |
Refactor gmock_mutant.h
This CL contains:
* Expose resulting type of Bind as MakeUnboundRunType.
* Refactor testing::CreateFunctor using base::Bind.
* Remove generate_gmock_mutant.py.
* Change argument ordering of testing::CreateFunctor to align to
base::Bind.
* Remove LATE_OBJECT_BINDING support, which no one use.
BUG=554299
Review URL: https://codereview.chromium.org/1680643002
Cr-Commit-Position: refs/heads/master@{#374689}
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc | 3 | ||||
| -rw-r--r-- | remoting/host/win/worker_process_launcher_unittest.cc | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc index bea275e..bb7a29c 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc @@ -132,7 +132,8 @@ TEST_F(It2MeConfirmationDialogProxyTest, Show) { .WillOnce( InvokeWithoutArgs( CreateFunctor( - dialog(), &StubIt2MeConfirmationDialog::ReportResult, + &StubIt2MeConfirmationDialog::ReportResult, + base::Unretained(dialog()), It2MeConfirmationDialog::Result::CANCEL))); EXPECT_CALL(callback_target, diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc index 840c2d5..ba27372 100644 --- a/remoting/host/win/worker_process_launcher_unittest.cc +++ b/remoting/host/win/worker_process_launcher_unittest.cc @@ -424,7 +424,8 @@ TEST_F(WorkerProcessLauncherTest, Restart) { EXPECT_CALL(server_listener_, OnChannelConnected(_)) .Times(2) .WillOnce(InvokeWithoutArgs(CreateFunctor( - this, &WorkerProcessLauncherTest::TerminateWorker, + &WorkerProcessLauncherTest::TerminateWorker, + base::Unretained(this), CONTROL_C_EXIT))) .WillOnce(InvokeWithoutArgs(this, &WorkerProcessLauncherTest::StopWorker)); @@ -470,7 +471,8 @@ TEST_F(WorkerProcessLauncherTest, PermanentError) { EXPECT_CALL(server_listener_, OnChannelConnected(_)) .Times(1) .WillOnce(InvokeWithoutArgs(CreateFunctor( - this, &WorkerProcessLauncherTest::TerminateWorker, + &WorkerProcessLauncherTest::TerminateWorker, + base::Unretained(this), kMinPermanentErrorExitCode))); EXPECT_CALL(server_listener_, OnPermanentError(_)) .Times(1) @@ -498,7 +500,8 @@ TEST_F(WorkerProcessLauncherTest, Crash) { EXPECT_CALL(client_listener_, OnCrash(_, _, _)) .Times(1) .WillOnce(InvokeWithoutArgs(CreateFunctor( - this, &WorkerProcessLauncherTest::TerminateWorker, + &WorkerProcessLauncherTest::TerminateWorker, + base::Unretained(this), EXCEPTION_BREAKPOINT))); StartWorker(); |