| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "chrome/browser/permissions/permission_request_manager.h" |
| 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" | |
| 10 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
| 11 #include "extensions/test/result_catcher.h" | 11 #include "extensions/test/result_catcher.h" |
| 12 #include "media/base/media_switches.h" | 12 #include "media/base/media_switches.h" |
| 13 #include "net/dns/mock_host_resolver.h" | 13 #include "net/dns/mock_host_resolver.h" |
| 14 #include "net/test/embedded_test_server/embedded_test_server.h" | 14 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 15 | 15 |
| 16 namespace extensions { | 16 namespace extensions { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 // Used to observe the creation of permission prompt without responding. | 20 // Used to observe the creation of permission prompt without responding. |
| 21 class PermissionRequestObserver : public PermissionBubbleManager::Observer { | 21 class PermissionRequestObserver : public PermissionRequestManager::Observer { |
| 22 public: | 22 public: |
| 23 explicit PermissionRequestObserver(content::WebContents* web_contents) | 23 explicit PermissionRequestObserver(content::WebContents* web_contents) |
| 24 : bubble_manager_(PermissionBubbleManager::FromWebContents(web_contents)), | 24 : request_manager_( |
| 25 PermissionRequestManager::FromWebContents(web_contents)), |
| 25 request_shown_(false) { | 26 request_shown_(false) { |
| 26 bubble_manager_->AddObserver(this); | 27 request_manager_->AddObserver(this); |
| 27 } | 28 } |
| 28 ~PermissionRequestObserver() override { | 29 ~PermissionRequestObserver() override { |
| 29 // Safe to remove twice if it happens. | 30 // Safe to remove twice if it happens. |
| 30 bubble_manager_->RemoveObserver(this); | 31 request_manager_->RemoveObserver(this); |
| 31 } | 32 } |
| 32 | 33 |
| 33 bool request_shown() const { return request_shown_; } | 34 bool request_shown() const { return request_shown_; } |
| 34 | 35 |
| 35 private: | 36 private: |
| 36 // PermissionBubbleManager::Observer | 37 // PermissionRequestManager::Observer |
| 37 void OnBubbleAdded() override { | 38 void OnBubbleAdded() override { |
| 38 request_shown_ = true; | 39 request_shown_ = true; |
| 39 bubble_manager_->RemoveObserver(this); | 40 request_manager_->RemoveObserver(this); |
| 40 } | 41 } |
| 41 | 42 |
| 42 PermissionBubbleManager* bubble_manager_; | 43 PermissionRequestManager* request_manager_; |
| 43 bool request_shown_; | 44 bool request_shown_; |
| 44 | 45 |
| 45 DISALLOW_COPY_AND_ASSIGN(PermissionRequestObserver); | 46 DISALLOW_COPY_AND_ASSIGN(PermissionRequestObserver); |
| 46 }; | 47 }; |
| 47 | 48 |
| 48 } // namespace | 49 } // namespace |
| 49 | 50 |
| 50 class WebRtcFromWebAccessibleResourceTest : public ExtensionApiTest { | 51 class WebRtcFromWebAccessibleResourceTest : public ExtensionApiTest { |
| 51 public: | 52 public: |
| 52 WebRtcFromWebAccessibleResourceTest() {} | 53 WebRtcFromWebAccessibleResourceTest() {} |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 // getUserMedia(), even if it is embedded in an insecure context. | 85 // getUserMedia(), even if it is embedded in an insecure context. |
| 85 IN_PROC_BROWSER_TEST_F(WebRtcFromWebAccessibleResourceTest, | 86 IN_PROC_BROWSER_TEST_F(WebRtcFromWebAccessibleResourceTest, |
| 86 GetUserMediaInWebAccessibleResourceSuccess) { | 87 GetUserMediaInWebAccessibleResourceSuccess) { |
| 87 host_resolver()->AddRule("a.com", "127.0.0.1"); | 88 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 88 ASSERT_TRUE(StartEmbeddedTestServer()); | 89 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 89 | 90 |
| 90 LoadTestExtension(); | 91 LoadTestExtension(); |
| 91 GURL url = GetTestServerInsecureUrl("/extensions/test_file.html?succeed"); | 92 GURL url = GetTestServerInsecureUrl("/extensions/test_file.html?succeed"); |
| 92 content::WebContents* web_contents = | 93 content::WebContents* web_contents = |
| 93 browser()->tab_strip_model()->GetActiveWebContents(); | 94 browser()->tab_strip_model()->GetActiveWebContents(); |
| 94 PermissionBubbleManager* bubble_manager = | 95 PermissionRequestManager* request_manager = |
| 95 PermissionBubbleManager::FromWebContents(web_contents); | 96 PermissionRequestManager::FromWebContents(web_contents); |
| 96 bubble_manager->set_auto_response_for_test( | 97 request_manager->set_auto_response_for_test( |
| 97 PermissionBubbleManager::ACCEPT_ALL); | 98 PermissionRequestManager::ACCEPT_ALL); |
| 98 PermissionRequestObserver permission_request_observer(web_contents); | 99 PermissionRequestObserver permission_request_observer(web_contents); |
| 99 extensions::ResultCatcher catcher; | 100 extensions::ResultCatcher catcher; |
| 100 ui_test_utils::NavigateToURL(browser(), url); | 101 ui_test_utils::NavigateToURL(browser(), url); |
| 101 | 102 |
| 102 ASSERT_TRUE(catcher.GetNextResult()); | 103 ASSERT_TRUE(catcher.GetNextResult()); |
| 103 EXPECT_TRUE(permission_request_observer.request_shown()); | 104 EXPECT_TRUE(permission_request_observer.request_shown()); |
| 104 } | 105 } |
| 105 | 106 |
| 106 // Verify that a chrome-extension:// web accessible URL will fail to access | 107 // Verify that a chrome-extension:// web accessible URL will fail to access |
| 107 // getUserMedia() if it is denied by the permission bubble, even if it is | 108 // getUserMedia() if it is denied by the permission request, even if it is |
| 108 // embedded in an insecure context. | 109 // embedded in an insecure context. |
| 109 IN_PROC_BROWSER_TEST_F(WebRtcFromWebAccessibleResourceTest, | 110 IN_PROC_BROWSER_TEST_F(WebRtcFromWebAccessibleResourceTest, |
| 110 GetUserMediaInWebAccessibleResourceFail) { | 111 GetUserMediaInWebAccessibleResourceFail) { |
| 111 host_resolver()->AddRule("a.com", "127.0.0.1"); | 112 host_resolver()->AddRule("a.com", "127.0.0.1"); |
| 112 ASSERT_TRUE(StartEmbeddedTestServer()); | 113 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 113 | 114 |
| 114 LoadTestExtension(); | 115 LoadTestExtension(); |
| 115 GURL url = GetTestServerInsecureUrl("/extensions/test_file.html?fail"); | 116 GURL url = GetTestServerInsecureUrl("/extensions/test_file.html?fail"); |
| 116 content::WebContents* web_contents = | 117 content::WebContents* web_contents = |
| 117 browser()->tab_strip_model()->GetActiveWebContents(); | 118 browser()->tab_strip_model()->GetActiveWebContents(); |
| 118 PermissionBubbleManager* bubble_manager = | 119 PermissionRequestManager* request_manager = |
| 119 PermissionBubbleManager::FromWebContents(web_contents); | 120 PermissionRequestManager::FromWebContents(web_contents); |
| 120 bubble_manager->set_auto_response_for_test(PermissionBubbleManager::DENY_ALL); | 121 request_manager->set_auto_response_for_test( |
| 122 PermissionRequestManager::DENY_ALL); |
| 121 PermissionRequestObserver permission_request_observer(web_contents); | 123 PermissionRequestObserver permission_request_observer(web_contents); |
| 122 extensions::ResultCatcher catcher; | 124 extensions::ResultCatcher catcher; |
| 123 ui_test_utils::NavigateToURL(browser(), url); | 125 ui_test_utils::NavigateToURL(browser(), url); |
| 124 | 126 |
| 125 ASSERT_TRUE(catcher.GetNextResult()); | 127 ASSERT_TRUE(catcher.GetNextResult()); |
| 126 EXPECT_TRUE(permission_request_observer.request_shown()); | 128 EXPECT_TRUE(permission_request_observer.request_shown()); |
| 127 } | 129 } |
| 128 | 130 |
| 129 } // namespace extensions | 131 } // namespace extensions |
| OLD | NEW |