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

chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/media/router/route_request_result.h"
+#include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_web_ui.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/test_util.h"
 #include "extensions/common/value_builder.h"
@@ skipping 19 matching lines @@
   ~MediaRouterUITest() override {
     EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_))
         .Times(AnyNumber());
     EXPECT_CALL(mock_router_, UnregisterMediaRoutesObserver(_))
         .Times(AnyNumber());
   }
 
   void CreateMediaRouterUI(Profile* profile) {
     initiator_.reset(content::WebContents::Create(
         content::WebContents::CreateParams(profile)));
+    SessionTabHelper::CreateForWebContents(initiator_.get());
     web_contents_.reset(content::WebContents::Create(
         content::WebContents::CreateParams(profile)));
     web_ui_.set_web_contents(web_contents_.get());
     media_router_ui_.reset(new MediaRouterUI(&web_ui_));
     message_handler_.reset(
         new MediaRouterWebUIMessageHandler(media_router_ui_.get()));
     EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
         .WillRepeatedly(Return(true));
     EXPECT_CALL(mock_router_, RegisterMediaRoutesObserver(_))
         .Times(AnyNumber());
     media_router_ui_->InitForTest(&mock_router_, initiator_.get(),
                                   message_handler_.get());
     message_handler_->SetWebUIForTest(&web_ui_);
   }
 
  protected:
   MockMediaRouter mock_router_;
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   scoped_ptr<content::WebContents> initiator_;
   content::TestWebUI web_ui_;
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<MediaRouterUI> media_router_ui_;
   scoped_ptr<MediaRouterWebUIMessageHandler> message_handler_;
 };
 
-TEST_F(MediaRouterUITest, RouteRequestTimedOut) {
-  CreateMediaRouterUI(&profile_);
-  std::vector<MediaRouteResponseCallback> callbacks;
-  EXPECT_CALL(mock_router_, CreateRoute(_, _, _, _, _, _, _))
-      .WillOnce(SaveArg<4>(&callbacks));
-  media_router_ui_->CreateRoute("sinkId", MediaCastMode::TAB_MIRROR);
-
-  EXPECT_CALL(mock_router_, AddIssue(_));
-  scoped_ptr<RouteRequestResult> result =
-      RouteRequestResult::FromError("Timed out", RouteRequestResult::TIMED_OUT);
-  for (const auto& callback : callbacks)
-    callback.Run(*result);
-}
-
 TEST_F(MediaRouterUITest, RouteCreationTimeoutForTab) {
   CreateMediaRouterUI(&profile_);
   EXPECT_CALL(
       mock_router_,
       CreateRoute(_, _, _, _, _, base::TimeDelta::FromSeconds(60), false));
   media_router_ui_->CreateRoute("sinkId", MediaCastMode::TAB_MIRROR);
 }
 
 TEST_F(MediaRouterUITest, RouteCreationTimeoutForDesktop) {
   CreateMediaRouterUI(&profile_);
@@ skipping 163 matching lines @@
 }
 
 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) {
   GURL url = GURL("https://www.google.com");
   scoped_ptr<extensions::ExtensionRegistry> registry =
       make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
 
   EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
 }
 }  // namespace media_router