[Media Router] Custom Controls 1 - Add MediaStatus, MediaRouteController, and mojo interfaces

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

Index: chrome/browser/media/router/mojo/media_route_controller_unittest.cc
diff --git a/chrome/browser/media/router/mojo/media_route_controller_unittest.cc b/chrome/browser/media/router/mojo/media_route_controller_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..97637e20886b95560b355c7d16bc92ed1c2534c6
--- /dev/null
+++ b/chrome/browser/media/router/mojo/media_route_controller_unittest.cc
@@ -0,0 +1,113 @@
+// Copyright 2017 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 "chrome/browser/media/router/mojo/media_route_controller.h"
+
+#include <string>
+#include <utility>
+
+#include "base/run_loop.h"
+#include "chrome/browser/media/router/mojo/media_router_mojo_test.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using ::testing::StrictMock;
+
+namespace media_router {
+
+class MockMediaController : public mojom::MediaController {
+ public:
+  MOCK_METHOD0(Play, void());
+  MOCK_METHOD0(Pause, void());
+  MOCK_METHOD1(SetMute, void(bool mute));
+  MOCK_METHOD1(SetVolume, void(float volume));
+  MOCK_METHOD1(Seek, void(base::TimeDelta time));
+};
+
+class MockMediaRouteControllerObserver : public MediaRouteController::Observer {
+ public:
+  MockMediaRouteControllerObserver(
+      scoped_refptr<MediaRouteController> controller)
+      : MediaRouteController::Observer(controller) {}
+
+  MOCK_METHOD1(OnMediaStatusUpdated, void(const MediaStatus& status));
+};
+
+class MediaRouteControllerTest : public ::testing::Test {
+ public:
+  MediaRouteControllerTest() {}
+  ~MediaRouteControllerTest() override {}
+
+  void SetUp() override {
+    mojom::MediaControllerPtr media_controller_ptr;
+    mojom::MediaControllerRequest media_controller_request =
+        mojo::MakeRequest(&media_controller_ptr);
+    media_controller_binding_ =
+        base::MakeUnique<mojo::Binding<mojom::MediaController>>(
+            &mock_media_controller_, std::move(media_controller_request));
+
+    observer_ = base::MakeUnique<MockMediaRouteControllerObserver>(
+        new MediaRouteController("routeId", std::move(media_controller_ptr)));
+  }
+
+  MediaRouteController* GetController() {
+    return observer_ ? observer_->controller() : nullptr;

[mark a. foltz, 2017/03/20 23:47:03]

Still not fixed - observer_ is always set in SetUp().

[takumif, 2017/03/21 04:00:07]

I had this because I was resetting observer_ in one of the tests, but removing
since I removed that test for now.

+  }
+
+ protected:
+  MockMediaController mock_media_controller_;
+  std::unique_ptr<mojo::Binding<mojom::MediaController>>
+      media_controller_binding_;
+  std::unique_ptr<MockMediaRouteControllerObserver> observer_;
+
+  content::TestBrowserThreadBundle test_thread_bundle_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MediaRouteControllerTest);
+};
+
+TEST_F(MediaRouteControllerTest, ForwardControllerCommands) {
+  const float volume = 0.5;
+  const base::TimeDelta time = base::TimeDelta::FromSeconds(42);
+
+  EXPECT_CALL(mock_media_controller_, Play());
+  GetController()->Play();
+  EXPECT_CALL(mock_media_controller_, Pause());
+  GetController()->Pause();
+  EXPECT_CALL(mock_media_controller_, SetMute(true));
+  GetController()->SetMute(true);
+  EXPECT_CALL(mock_media_controller_, SetVolume(volume));
+  GetController()->SetVolume(volume);
+  EXPECT_CALL(mock_media_controller_, Seek(time));
+  GetController()->Seek(time);
+}
+
+TEST_F(MediaRouteControllerTest, NotifyMediaRouteControllerObservers) {
+  std::unique_ptr<StrictMock<MockMediaRouteControllerObserver>> observer1 =
+      base::MakeUnique<StrictMock<MockMediaRouteControllerObserver>>(
+          GetController());
+  std::unique_ptr<StrictMock<MockMediaRouteControllerObserver>> observer2 =
+      base::MakeUnique<StrictMock<MockMediaRouteControllerObserver>>(
+          GetController());
+
+  MediaStatus status;
+  status.title = "test media status";
+
+  EXPECT_CALL(*observer1, OnMediaStatusUpdated(status));
+  EXPECT_CALL(*observer2, OnMediaStatusUpdated(status));
+  // TODO(takumif): Use a mojom::MediaStatusObserverPtr bound to the controller.

[mark a. foltz, 2017/03/20 23:47:03]

Still don't quite follow this, but as long as it makes sense to you and is fixed
in a followup patch :)

[takumif, 2017/03/21 04:00:07]

Here, instead of calling OnMediaStatusUpdated() on the controller directly, I
want to call the method on an interface pointer bound to the controller, like
the extension-side controller would.

+  GetController()->OnMediaStatusUpdated(status);
+
+  observer1.reset();
+  std::unique_ptr<StrictMock<MockMediaRouteControllerObserver>> observer3 =
+      base::MakeUnique<StrictMock<MockMediaRouteControllerObserver>>(
+          GetController());
+
+  EXPECT_CALL(*observer2, OnMediaStatusUpdated(status));
+  EXPECT_CALL(*observer3, OnMediaStatusUpdated(status));
+  // TODO(takumif): Use a mojom::MediaStatusObserverPtr bound to the controller.
+  GetController()->OnMediaStatusUpdated(status);
+}
+

[takumif, 2017/03/20 22:10:46]

I'll be adding the two tests that I removed here in the next CL, since we're no
longer doing destructor_callback.

+}  // namespace media_router