Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4428)

Unified Diff: chrome/browser/media/router/mojo/media_router_mojo_test.h

Issue 2728543009: [Media Router] Custom Controls 2 - add MediaRouter::GetRouteController() (Closed)
Patch Set: Combine CreateMRController and SetMRStatusObserver Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/router/mojo/media_router_mojo_test.h
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_test.h b/chrome/browser/media/router/mojo/media_router_mojo_test.h
index 2538ed63bf6b8145bd7f23651a7e14b3a3be62a9..b90e43eeec3c971addda06e9488884dbf2ee7ec2 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_test.h
+++ b/chrome/browser/media/router/mojo/media_router_mojo_test.h
@@ -90,15 +90,28 @@ class MockMediaRouteProvider : public mojom::MediaRouteProvider {
const std::string& media_source,
mojom::SinkSearchCriteriaPtr search_criteria,
const SearchSinksCallback& callback) override {
- SearchSinks_(sink_id, media_source, search_criteria, callback);
+ SearchSinksInternal(sink_id, media_source, search_criteria, callback);
}
- MOCK_METHOD4(SearchSinks_,
+ MOCK_METHOD4(SearchSinksInternal,
void(const std::string& sink_id,
const std::string& media_source,
mojom::SinkSearchCriteriaPtr& search_criteria,
const SearchSinksCallback& callback));
MOCK_METHOD2(ProvideSinks,
void(const std::string&, const std::vector<MediaSinkInternal>&));
+ void CreateMediaRouteController(
+ const std::string& route_id,
+ mojom::MediaControllerRequest media_controller,
+ mojom::MediaStatusObserverPtr observer,
+ const CreateMediaRouteControllerCallback& callback) override {
+ CreateMediaRouteControllerInternal(route_id, media_controller, observer,
+ callback);
+ }
+ MOCK_METHOD4(CreateMediaRouteControllerInternal,
+ void(const std::string& route_id,
+ mojom::MediaControllerRequest& media_controller,
+ mojom::MediaStatusObserverPtr& observer,
+ const CreateMediaRouteControllerCallback& callback));
private:
DISALLOW_COPY_AND_ASSIGN(MockMediaRouteProvider);
@@ -115,6 +128,35 @@ class MockEventPageTracker : public extensions::EventPageTracker {
const base::Callback<void(bool)>& callback));
};
+class MockMediaController : public mojom::MediaController {
+ public:
+ MockMediaController();
+ ~MockMediaController();
+
+ void Bind(mojom::MediaControllerRequest request);
+ mojom::MediaControllerPtr BindInterfacePtr();
+ void CloseBinding();
+
+ 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));
+
+ private:
+ mojo::Binding<mojom::MediaController> binding_;
+};
+
+class MockMediaRouteControllerObserver : public MediaRouteController::Observer {
+ public:
+ MockMediaRouteControllerObserver(
+ scoped_refptr<MediaRouteController> controller);
+ ~MockMediaRouteControllerObserver() override;
+
+ MOCK_METHOD1(OnMediaStatusUpdated, void(const MediaStatus& status));
+ MOCK_METHOD0(OnControllerInvalidated, void());
+};
+
// Tests the API call flow between the MediaRouterMojoImpl and the Media Router
// Mojo service in both directions.
class MediaRouterMojoTest : public ::testing::Test {

Powered by Google App Engine
This is Rietveld 408576698