[Media Router] Adds return value to mojo MediaRouteProvider::TerminateRoute.

chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 161 matching lines @@
 template <typename T>
 void StoreAndRun(T* result, const base::Closure& closure, const T& result_val) {
   *result = result_val;
   closure.Run();
 }
 
 class MediaRouterMojoImplTest : public MediaRouterMojoTest {
  public:
   MediaRouterMojoImplTest() {}
   ~MediaRouterMojoImplTest() override {}
+
+  void ExpectResultBucketCount(const std::string& operation,
+                               RouteRequestResult::ResultCode result_code,
+                               int expected_count) {
+    histogram_tester_.ExpectBucketCount(
+        "MediaRouter.Provider." + operation + ".Result",
+        result_code,
+        expected_count);
+  }
+
+ private:
+  base::HistogramTester histogram_tester_;
 };
 
 // ProcessManager with a mocked method subset, for testing extension suspend
 // handling.
 class TestProcessManager : public extensions::ProcessManager {
  public:
   explicit TestProcessManager(content::BrowserContext* context)
       : extensions::ProcessManager(
             context,
             context,
@@ skipping 177 matching lines @@
   mojo::Array<interfaces::MediaRoutePtr> mojo_routes(1);
   mojo_routes[0] = route->Clone();
   router()->OnRoutesUpdated(std::move(mojo_routes), mojo::String(),
                             mojo::Array<mojo::String>());
 
   // TODO(mfoltz): Where possible, convert other tests to use RunUntilIdle
   // instead of manually calling Run/Quit on the run loop.
   run_loop.RunUntilIdle();
 
   EXPECT_CALL(mock_media_route_provider_,
-              TerminateRoute(mojo::String(kRouteId)));
+              TerminateRoute(mojo::String(kRouteId), _))
+      .WillOnce(Invoke([](
+          const mojo::String& route_id,
+          const interfaces::MediaRouteProvider::TerminateRouteCallback& cb) {
+         cb.Run(mojo::String(), interfaces::RouteRequestResultCode::OK);
+       }));
+
   base::RunLoop run_loop2;
   router()->OnOffTheRecordProfileShutdown();
   run_loop2.RunUntilIdle();
 }
 
 TEST_F(MediaRouterMojoImplTest, JoinRoute) {
   MediaSource media_source(kSource);
   MediaRoute expected_route(kRouteId, media_source, kSinkId, "", false, "",
                             false);
 
@@ skipping 237 matching lines @@
   base::RunLoop run_loop;
   EXPECT_CALL(mock_media_route_provider_, DetachRoute(mojo::String(kRouteId)))
       .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
   router()->DetachRoute(kRouteId);
   run_loop.Run();
 }
 
 TEST_F(MediaRouterMojoImplTest, TerminateRoute) {
   base::RunLoop run_loop;
   EXPECT_CALL(mock_media_route_provider_,
-              TerminateRoute(mojo::String(kRouteId)))
-      .WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
+              TerminateRoute(mojo::String(kRouteId), _))
+      .WillOnce(Invoke([&run_loop](
+          const mojo::String& route_id,
+          const interfaces::MediaRouteProvider::TerminateRouteCallback& cb) {
+        cb.Run(mojo::String(), interfaces::RouteRequestResultCode::OK);
+      }));
   router()->TerminateRoute(kRouteId);
-  run_loop.Run();
+  run_loop.RunUntilIdle();
+  ExpectResultBucketCount("TerminateRoute",
+                          RouteRequestResult::ResultCode::OK,
+                          1);
+}
+
+TEST_F(MediaRouterMojoImplTest, TerminateRouteFails) {
+  base::RunLoop run_loop;
+  EXPECT_CALL(mock_media_route_provider_,
+              TerminateRoute(mojo::String(kRouteId), _))
+      .WillOnce(Invoke([&run_loop](
+          const mojo::String& route_id,
+          const interfaces::MediaRouteProvider::TerminateRouteCallback& cb) {
+        cb.Run(mojo::String(), interfaces::RouteRequestResultCode::TIMED_OUT);
+      }));
+  router()->TerminateRoute(kRouteId);
+  run_loop.RunUntilIdle();
+  ExpectResultBucketCount("TerminateRoute",
+                          RouteRequestResult::ResultCode::OK,
+                          0);
+  ExpectResultBucketCount("TerminateRoute",
+                          RouteRequestResult::ResultCode::TIMED_OUT,
+                          1);
 }
 
 TEST_F(MediaRouterMojoImplTest, HandleIssue) {
   MockIssuesObserver issue_observer1(router());
   MockIssuesObserver issue_observer2(router());
   issue_observer1.RegisterObserver();
   issue_observer2.RegisterObserver();
 
   interfaces::IssuePtr mojo_issue1 = CreateMojoIssue("title 1");
   const Issue& expected_issue1 = mojo_issue1.To<Issue>();
@@ skipping 905 matching lines @@
   EXPECT_CALL(mock_media_route_provider_,
               UpdateMediaSinks(mojo::String(MediaSourceForDesktop().id())))
       .WillOnce(InvokeWithoutArgs([&run_loop2]() {
         run_loop2.Quit();
       }));
 
   run_loop2.Run();
 }
 
 }  // namespace media_router