Update webrtc::DesktopCapturer clients to implement OnCaptureResult().

remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/ipc_desktop_environment.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 48 matching lines @@
 using protocol::test::EqualsTouchEvent;
 using protocol::test::EqualsTouchEventTypeAndId;
 
 namespace {
 
 class MockScreenCapturerCallback : public webrtc::ScreenCapturer::Callback {
  public:
   MockScreenCapturerCallback() {}
   virtual ~MockScreenCapturerCallback() {}
 
-  MOCK_METHOD1(OnCaptureCompleted, void(webrtc::DesktopFrame*));
+  MOCK_METHOD2(OnCaptureResultPtr,
+               void(webrtc::DesktopCapturer::Result result,
+                    std::unique_ptr<webrtc::DesktopFrame>* frame));
+  void OnCaptureResult(webrtc::DesktopCapturer::Result result,
+                       std::unique_ptr<webrtc::DesktopFrame> frame) override {
+    OnCaptureResultPtr(result, &frame);
+  }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockScreenCapturerCallback);
 };
 
 // Receives messages sent from the network process to the daemon.
 class FakeDaemonSender : public IPC::Sender {
  public:
   FakeDaemonSender() {}
   ~FakeDaemonSender() override {}
@@ skipping 456 matching lines @@
       .Times(0);
 
   // Start the input injector and screen capturer.
   input_injector_->Start(std::move(clipboard_stub));
   video_capturer_->Start(&desktop_capturer_callback_);
 
   // Run the message loop until the desktop is attached.
   setup_run_loop_->Run();
 
   // Stop the test when the first frame is captured.
-  EXPECT_CALL(desktop_capturer_callback_, OnCaptureCompleted(_))
-      .WillOnce(DoAll(
-          DeleteArg<0>(),
-          InvokeWithoutArgs(
-              this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment)));
+  EXPECT_CALL(desktop_capturer_callback_, OnCaptureResultPtr(_, _))
+      .WillOnce(InvokeWithoutArgs(
+          this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Capture a single frame.
   video_capturer_->Capture(webrtc::DesktopRegion());
 }
 
 // Tests that attaching to a new desktop works.
 TEST_F(IpcDesktopEnvironmentTest, Reattach) {
   std::unique_ptr<protocol::MockClipboardStub> clipboard_stub(
       new protocol::MockClipboardStub());
   EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_))
@@ skipping 189 matching lines @@
       .WillOnce(InvokeWithoutArgs(
           this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
 
   // Change the desktop resolution.
   screen_controls_->SetScreenResolution(ScreenResolution(
       webrtc::DesktopSize(100, 100),
       webrtc::DesktopVector(96, 96)));
 }
 
 }  // namespace remoting