OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/logging.h" | 6 #include "base/logging.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
10 #include "chrome/test/base/test_switches.h" | 10 #include "chrome/test/base/test_switches.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 .AppendASCII("extension_resource_request_policy") | 41 .AppendASCII("extension_resource_request_policy") |
42 .AppendASCII("extension"), | 42 .AppendASCII("extension"), |
43 // Tests manifest_version 1 behavior, so warnings are expected. | 43 // Tests manifest_version 1 behavior, so warnings are expected. |
44 ExtensionBrowserTest::kFlagIgnoreManifestWarnings)); | 44 ExtensionBrowserTest::kFlagIgnoreManifestWarnings)); |
45 | 45 |
46 GURL web_resource( | 46 GURL web_resource( |
47 test_server()->GetURL( | 47 test_server()->GetURL( |
48 "files/extensions/api_test/extension_resource_request_policy/" | 48 "files/extensions/api_test/extension_resource_request_policy/" |
49 "index.html")); | 49 "index.html")); |
50 | 50 |
51 std::string host_a("a.com"); | |
52 GURL::Replacements make_host_a_com; | 51 GURL::Replacements make_host_a_com; |
53 make_host_a_com.SetHostStr(host_a); | 52 make_host_a_com.SetHostStr("a.com"); |
54 | 53 |
55 std::string host_b("b.com"); | |
56 GURL::Replacements make_host_b_com; | 54 GURL::Replacements make_host_b_com; |
57 make_host_b_com.SetHostStr(host_b); | 55 make_host_b_com.SetHostStr("b.com"); |
58 | 56 |
59 // A web host that has permission. | 57 // A web host that has permission. |
60 ui_test_utils::NavigateToURL( | 58 ui_test_utils::NavigateToURL( |
61 browser(), web_resource.ReplaceComponents(make_host_a_com)); | 59 browser(), web_resource.ReplaceComponents(make_host_a_com)); |
62 std::string result; | 60 std::string result; |
63 ASSERT_TRUE(content::ExecuteScriptAndExtractString( | 61 ASSERT_TRUE(content::ExecuteScriptAndExtractString( |
64 browser()->tab_strip_model()->GetActiveWebContents(), | 62 browser()->tab_strip_model()->GetActiveWebContents(), |
65 "window.domAutomationController.send(document.title)", | 63 "window.domAutomationController.send(document.title)", |
66 &result)); | 64 &result)); |
67 EXPECT_EQ(result, "Loaded"); | 65 EXPECT_EQ(result, "Loaded"); |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 | 332 |
335 #if defined(OS_MACOSX) | 333 #if defined(OS_MACOSX) |
336 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources | 334 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
337 #else | 335 #else |
338 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 336 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
339 #endif | 337 #endif |
340 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 338 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
341 MAYBE_ExtensionAccessibleResources) { | 339 MAYBE_ExtensionAccessibleResources) { |
342 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 340 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
343 } | 341 } |
OLD | NEW |