[Media Router] Cherrypick "add sinks to origin list" to beta

chrome/browser/media/router/test_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 134 matching lines @@
                void(const mojo::String& route_id));
   MOCK_METHOD1(StartObservingMediaRoutes, void(const mojo::String& source));
   MOCK_METHOD1(StopObservingMediaRoutes, void(const mojo::String& source));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockMediaRouteProvider);
 };
 
 class MockMediaSinksObserver : public MediaSinksObserver {
  public:
-  MockMediaSinksObserver(MediaRouter* router, const MediaSource& source);
+  MockMediaSinksObserver(MediaRouter* router,
+                         const MediaSource& source,
+                         const GURL& origin);
   ~MockMediaSinksObserver() override;
 
   MOCK_METHOD1(OnSinksReceived, void(const std::vector<MediaSink>& sinks));
 };
 
 class MockMediaRoutesObserver : public MediaRoutesObserver {
  public:
   explicit MockMediaRoutesObserver(MediaRouter* router,
       const MediaSource::Id source_id = std::string());
   ~MockMediaRoutesObserver() override;
@@ skipping 17 matching lines @@
  public:
   MockPresentationConnectionStateChangedCallback();
   ~MockPresentationConnectionStateChangedCallback();
   MOCK_METHOD1(Run,
                void(const content::PresentationConnectionStateChangeInfo&));
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_TEST_HELPER_H_