OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 #include "chrome/browser/extensions/extension_service.h" | 6 #include "chrome/browser/extensions/extension_service.h" |
7 #include "chrome/browser/extensions/extension_test_message_listener.h" | 7 #include "chrome/browser/extensions/extension_test_message_listener.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
11 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
12 | 12 |
13 const std::string kAllUrlsTarget = | 13 const std::string kAllUrlsTarget = |
14 "files/extensions/api_test/all_urls/index.html"; | 14 "files/extensions/api_test/all_urls/index.html"; |
15 | 15 |
16 typedef ExtensionApiTest AllUrlsApiTest; | 16 typedef ExtensionApiTest AllUrlsApiTest; |
17 | 17 |
18 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, WhitelistedExtension) { | 18 // http://crbug.com/118293 |
| 19 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, DISABLED_WhitelistedExtension) { |
19 // First setup the two extensions. | 20 // First setup the two extensions. |
20 FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") | 21 FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") |
21 .AppendASCII("content_script"); | 22 .AppendASCII("content_script"); |
22 FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") | 23 FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") |
23 .AppendASCII("execute_script"); | 24 .AppendASCII("execute_script"); |
24 | 25 |
25 // Then add the two extensions to the whitelist. | 26 // Then add the two extensions to the whitelist. |
26 Extension::ScriptingWhitelist whitelist; | 27 Extension::ScriptingWhitelist whitelist; |
27 whitelist.push_back(Extension::GenerateIdForPath(extension_dir1)); | 28 whitelist.push_back(Extension::GenerateIdForPath(extension_dir1)); |
28 whitelist.push_back(Extension::GenerateIdForPath(extension_dir2)); | 29 whitelist.push_back(Extension::GenerateIdForPath(extension_dir2)); |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 // Now verify we can script a regular http page. | 100 // Now verify we can script a regular http page. |
100 ASSERT_TRUE(test_server()->Start()); | 101 ASSERT_TRUE(test_server()->Start()); |
101 GURL page_url = test_server()->GetURL(kAllUrlsTarget); | 102 GURL page_url = test_server()->GetURL(kAllUrlsTarget); |
102 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), | 103 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), |
103 false); | 104 false); |
104 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); | 105 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); |
105 ui_test_utils::NavigateToURL(browser(), page_url); | 106 ui_test_utils::NavigateToURL(browser(), page_url); |
106 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); | 107 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); |
107 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); | 108 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); |
108 } | 109 } |
OLD | NEW |