[Media Router] Connection state change listening redesign part 2.

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 24af92df033a356ccf0941858233fa98634bc4bc..38f051792e6cc76016b7204906685783999afb23 100644
--- a/chrome/browser/media/router/test_helper.h
+++ b/chrome/browser/media/router/test_helper.h
@@ -13,7 +13,6 @@
 #include "chrome/browser/media/router/media_router_mojo_impl.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
-#include "chrome/browser/media/router/presentation_connection_state_observer.h"
 #include "extensions/browser/event_page_tracker.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -145,17 +144,6 @@ class MockMediaRoutesObserver : public MediaRoutesObserver {
   MOCK_METHOD1(OnRoutesUpdated, void(const std::vector<MediaRoute>& sinks));
 };
 
-class MockPresentationConnectionStateObserver
-    : public PresentationConnectionStateObserver {
- public:
-  MockPresentationConnectionStateObserver(MediaRouter* router,
-                                          const MediaRoute::Id& route_id);
-  ~MockPresentationConnectionStateObserver() override;
-
-  MOCK_METHOD1(OnStateChanged,
-               void(content::PresentationConnectionState state));
-};
-
 class MockEventPageTracker : public extensions::EventPageTracker {
  public:
   MockEventPageTracker();
@@ -167,6 +155,13 @@ class MockEventPageTracker : public extensions::EventPageTracker {
                     const base::Callback<void(bool)>& callback));
 };
 
+class MockPresentationConnectionStateChangedCallback {
+ public:
+  MockPresentationConnectionStateChangedCallback();
+  ~MockPresentationConnectionStateChangedCallback();
+  MOCK_METHOD1(Run, void(content::PresentationConnectionState));
+};
+
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_