| 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_service.h" | |
| 8 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/test/base/test_switches.h" | 9 #include "chrome/test/base/test_switches.h" |
| 11 #include "chrome/test/base/ui_test_utils.h" | 10 #include "chrome/test/base/ui_test_utils.h" |
| 12 #include "components/crx_file/id_util.h" | 11 #include "components/crx_file/id_util.h" |
| 13 #include "extensions/browser/extension_system.h" | 12 #include "extensions/browser/extension_registry.h" |
| 14 #include "extensions/common/extension.h" | 13 #include "extensions/common/extension.h" |
| 15 #include "extensions/common/extensions_client.h" | 14 #include "extensions/common/extensions_client.h" |
| 16 #include "extensions/test/extension_test_message_listener.h" | 15 #include "extensions/test/extension_test_message_listener.h" |
| 17 #include "net/test/embedded_test_server/embedded_test_server.h" | 16 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 18 | 17 |
| 19 const std::string kAllUrlsTarget = "/extensions/api_test/all_urls/index.html"; | 18 const std::string kAllUrlsTarget = "/extensions/api_test/all_urls/index.html"; |
| 20 | 19 |
| 21 typedef ExtensionApiTest AllUrlsApiTest; | 20 typedef ExtensionApiTest AllUrlsApiTest; |
| 22 | 21 |
| 23 #if defined(OS_WIN) && !defined(NDEBUG) | 22 #if defined(OS_WIN) && !defined(NDEBUG) |
| (...skipping 15 matching lines...) Expand all Loading... |
| 39 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") | 38 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") |
| 40 .AppendASCII("execute_script"); | 39 .AppendASCII("execute_script"); |
| 41 | 40 |
| 42 // Then add the two extensions to the whitelist. | 41 // Then add the two extensions to the whitelist. |
| 43 extensions::ExtensionsClient::ScriptingWhitelist whitelist; | 42 extensions::ExtensionsClient::ScriptingWhitelist whitelist; |
| 44 whitelist.push_back(crx_file::id_util::GenerateIdForPath(extension_dir1)); | 43 whitelist.push_back(crx_file::id_util::GenerateIdForPath(extension_dir1)); |
| 45 whitelist.push_back(crx_file::id_util::GenerateIdForPath(extension_dir2)); | 44 whitelist.push_back(crx_file::id_util::GenerateIdForPath(extension_dir2)); |
| 46 extensions::ExtensionsClient::Get()->SetScriptingWhitelist(whitelist); | 45 extensions::ExtensionsClient::Get()->SetScriptingWhitelist(whitelist); |
| 47 | 46 |
| 48 // Then load extensions. | 47 // Then load extensions. |
| 49 ExtensionService* service = extensions::ExtensionSystem::Get( | 48 extensions::ExtensionRegistry* registry = |
| 50 browser()->profile())->extension_service(); | 49 extensions::ExtensionRegistry::Get(browser()->profile()); |
| 51 const size_t size_before = service->extensions()->size(); | 50 const size_t size_before = registry->enabled_extensions().size(); |
| 52 ASSERT_TRUE(LoadExtension(extension_dir1)); | 51 ASSERT_TRUE(LoadExtension(extension_dir1)); |
| 53 ASSERT_TRUE(LoadExtension(extension_dir2)); | 52 ASSERT_TRUE(LoadExtension(extension_dir2)); |
| 54 EXPECT_EQ(size_before + 2, service->extensions()->size()); | 53 EXPECT_EQ(size_before + 2, registry->enabled_extensions().size()); |
| 55 | 54 |
| 56 std::string url; | 55 std::string url; |
| 57 | 56 |
| 58 // Now verify we run content scripts on chrome://newtab/. | 57 // Now verify we run content scripts on chrome://newtab/. |
| 59 url = "chrome://newtab/"; | 58 url = "chrome://newtab/"; |
| 60 ExtensionTestMessageListener listener1a("content script: " + url, false); | 59 ExtensionTestMessageListener listener1a("content script: " + url, false); |
| 61 ExtensionTestMessageListener listener1b("execute: " + url, false); | 60 ExtensionTestMessageListener listener1b("execute: " + url, false); |
| 62 ui_test_utils::NavigateToURL(browser(), GURL(url)); | 61 ui_test_utils::NavigateToURL(browser(), GURL(url)); |
| 63 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); | 62 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); |
| 64 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); | 63 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 | 99 |
| 101 // Test that an extension NOT whitelisted for scripting can ask for <all_urls> | 100 // Test that an extension NOT whitelisted for scripting can ask for <all_urls> |
| 102 // and run scripts on non-restricted all pages. | 101 // and run scripts on non-restricted all pages. |
| 103 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) { | 102 IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) { |
| 104 // First load the two extensions. | 103 // First load the two extensions. |
| 105 base::FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") | 104 base::FilePath extension_dir1 = test_data_dir_.AppendASCII("all_urls") |
| 106 .AppendASCII("content_script"); | 105 .AppendASCII("content_script"); |
| 107 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") | 106 base::FilePath extension_dir2 = test_data_dir_.AppendASCII("all_urls") |
| 108 .AppendASCII("execute_script"); | 107 .AppendASCII("execute_script"); |
| 109 | 108 |
| 110 ExtensionService* service = extensions::ExtensionSystem::Get( | 109 extensions::ExtensionRegistry* registry = |
| 111 browser()->profile())->extension_service(); | 110 extensions::ExtensionRegistry::Get(browser()->profile()); |
| 112 const size_t size_before = service->extensions()->size(); | 111 const size_t size_before = registry->enabled_extensions().size(); |
| 113 ASSERT_TRUE(LoadExtension(extension_dir1)); | 112 ASSERT_TRUE(LoadExtension(extension_dir1)); |
| 114 ASSERT_TRUE(LoadExtension(extension_dir2)); | 113 ASSERT_TRUE(LoadExtension(extension_dir2)); |
| 115 EXPECT_EQ(size_before + 2, service->extensions()->size()); | 114 EXPECT_EQ(size_before + 2, registry->enabled_extensions().size()); |
| 116 | 115 |
| 117 // Now verify we can script a regular http page. | 116 // Now verify we can script a regular http page. |
| 118 ASSERT_TRUE(StartEmbeddedTestServer()); | 117 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 119 GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget); | 118 GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget); |
| 120 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), | 119 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), |
| 121 false); | 120 false); |
| 122 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); | 121 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); |
| 123 ui_test_utils::NavigateToURL(browser(), page_url); | 122 ui_test_utils::NavigateToURL(browser(), page_url); |
| 124 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); | 123 ASSERT_TRUE(listener1a.WaitUntilSatisfied()); |
| 125 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); | 124 ASSERT_TRUE(listener1b.WaitUntilSatisfied()); |
| 126 } | 125 } |
| OLD | NEW |