Show Media Router toolbar icon ephemerally for MR dialogs

chrome/browser/media/router/test_helper.h

Index: chrome/browser/media/router/test_helper.h
diff --git a/chrome/browser/media/router/test_helper.h b/chrome/browser/media/router/test_helper.h
index 3179d1511b3c544be3f59e2c1e9f42b2a6641aae..d3728aad7beaf77321ec248509d4f13b54122367 100644
--- a/chrome/browser/media/router/test_helper.h
+++ b/chrome/browser/media/router/test_helper.h
@@ -13,8 +13,10 @@
 
 #include "base/macros.h"
 #include "chrome/browser/media/router/issues_observer.h"
+#include "chrome/browser/media/router/media_router_ui_service.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
+#include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 #include "content/public/browser/presentation_service_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -82,6 +84,11 @@ MATCHER_P(StateChageInfoEquals, other, "") {
          arg.message == other.message;
 }
 
+void MockPresentationSessionSuccessCallback(
+    const content::PresentationSessionInfo&,
+    const MediaRoute::Id&);
+void MockPresentationSessionErrorCallback(const content::PresentationError&);
+
 class MockIssuesObserver : public IssuesObserver {
  public:
   explicit MockIssuesObserver(MediaRouter* router);
@@ -118,6 +125,32 @@ class MockPresentationConnectionStateChangedCallback {
                void(const content::PresentationConnectionStateChangeInfo&));
 };
 
+class MockMediaRouterActionController : public MediaRouterActionController {

[mark a. foltz, 2016/10/17 18:57:39]

It feels odd that this ended up in c/b/media/router.  IMO, this belongs with the
class being mocked in c/b/ui/toolbar, or with the unittest that uses it if
there's only one. 

[takumif, 2016/10/27 23:06:38]

Moved to media_router_web_ui_test.h, where it's used.

+ public:
+  explicit MockMediaRouterActionController(Profile* profile);
+  ~MockMediaRouterActionController() override;
+
+  MOCK_METHOD1(OnIssueUpdated, void(const media_router::Issue* issue));
+  MOCK_METHOD2(OnRoutesUpdated,
+               void(const std::vector<media_router::MediaRoute>& routes,
+                    const std::vector<media_router::MediaRoute::Id>&
+                        joinable_route_ids));
+  MOCK_METHOD0(OnDialogShown, void());
+  MOCK_METHOD0(OnDialogHidden, void());
+  MOCK_METHOD0(MaybeAddOrRemoveAction, void());
+};
+
+class MockMediaRouterUIService : public MediaRouterUIService {
+ public:
+  explicit MockMediaRouterUIService(Profile* profile);
+  ~MockMediaRouterUIService() override;
+
+  MediaRouterActionController* action_controller() const override;
+
+ private:
+  std::unique_ptr<MediaRouterActionController> action_controller_;
+};
+
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_