| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/media/router/media_route.h" | 7 #include "chrome/browser/media/router/media_route.h" |
| 8 #include "chrome/browser/media/router/mock_media_router.h" | 8 #include "chrome/browser/media/router/mock_media_router.h" |
| 9 #include "chrome/browser/media/router/route_request_result.h" | 9 #include "chrome/browser/media/router/route_request_result.h" |
| 10 #include "chrome/browser/media/router/test_helper.h" | 10 #include "chrome/browser/media/router/test_helper.h" |
| 11 #include "chrome/browser/sessions/session_tab_helper.h" |
| 11 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" | 12 #include "chrome/browser/ui/webui/media_router/media_router_ui.h" |
| 12 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handle
r.h" | 13 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handle
r.h" |
| 13 #include "chrome/grit/generated_resources.h" | 14 #include "chrome/grit/generated_resources.h" |
| 14 #include "chrome/test/base/testing_profile.h" | 15 #include "chrome/test/base/testing_profile.h" |
| 15 #include "content/public/test/test_browser_thread_bundle.h" | 16 #include "content/public/test/test_browser_thread_bundle.h" |
| 16 #include "content/public/test/test_web_ui.h" | 17 #include "content/public/test/test_web_ui.h" |
| 17 #include "extensions/browser/extension_registry.h" | 18 #include "extensions/browser/extension_registry.h" |
| 18 #include "extensions/common/extension.h" | 19 #include "extensions/common/extension.h" |
| 19 #include "extensions/common/extension_builder.h" | 20 #include "extensions/common/extension_builder.h" |
| 20 #include "extensions/common/test_util.h" | 21 #include "extensions/common/test_util.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 42 ~MediaRouterUITest() override { | 43 ~MediaRouterUITest() override { |
| 43 EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)) | 44 EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)) |
| 44 .Times(AnyNumber()); | 45 .Times(AnyNumber()); |
| 45 EXPECT_CALL(mock_router_, UnregisterMediaRoutesObserver(_)) | 46 EXPECT_CALL(mock_router_, UnregisterMediaRoutesObserver(_)) |
| 46 .Times(AnyNumber()); | 47 .Times(AnyNumber()); |
| 47 } | 48 } |
| 48 | 49 |
| 49 void CreateMediaRouterUI(Profile* profile) { | 50 void CreateMediaRouterUI(Profile* profile) { |
| 50 initiator_.reset(content::WebContents::Create( | 51 initiator_.reset(content::WebContents::Create( |
| 51 content::WebContents::CreateParams(profile))); | 52 content::WebContents::CreateParams(profile))); |
| 53 SessionTabHelper::CreateForWebContents(initiator_.get()); |
| 52 web_contents_.reset(content::WebContents::Create( | 54 web_contents_.reset(content::WebContents::Create( |
| 53 content::WebContents::CreateParams(profile))); | 55 content::WebContents::CreateParams(profile))); |
| 54 web_ui_.set_web_contents(web_contents_.get()); | 56 web_ui_.set_web_contents(web_contents_.get()); |
| 55 media_router_ui_.reset(new MediaRouterUI(&web_ui_)); | 57 media_router_ui_.reset(new MediaRouterUI(&web_ui_)); |
| 56 message_handler_.reset( | 58 message_handler_.reset( |
| 57 new MediaRouterWebUIMessageHandler(media_router_ui_.get())); | 59 new MediaRouterWebUIMessageHandler(media_router_ui_.get())); |
| 58 EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_)) | 60 EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_)) |
| 59 .WillRepeatedly(Return(true)); | 61 .WillRepeatedly(Return(true)); |
| 60 EXPECT_CALL(mock_router_, RegisterMediaRoutesObserver(_)) | 62 EXPECT_CALL(mock_router_, RegisterMediaRoutesObserver(_)) |
| 61 .Times(AnyNumber()); | 63 .Times(AnyNumber()); |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 } | 285 } |
| 284 | 286 |
| 285 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) { | 287 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) { |
| 286 GURL url = GURL("https://www.google.com"); | 288 GURL url = GURL("https://www.google.com"); |
| 287 scoped_ptr<extensions::ExtensionRegistry> registry = | 289 scoped_ptr<extensions::ExtensionRegistry> registry = |
| 288 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); | 290 make_scoped_ptr(new extensions::ExtensionRegistry(nullptr)); |
| 289 | 291 |
| 290 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get())); | 292 EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get())); |
| 291 } | 293 } |
| 292 } // namespace media_router | 294 } // namespace media_router |
| OLD | NEW |