| 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/logging.h" | 5 #include "base/logging.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 9 #include "chrome/common/chrome_switches.h" | |
| 10 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 11 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
| 12 #include "content/public/test/browser_test_utils.h" | 11 #include "content/public/test/browser_test_utils.h" |
| 12 #include "extensions/common/switches.h" |
| 13 #include "net/dns/mock_host_resolver.h" | 13 #include "net/dns/mock_host_resolver.h" |
| 14 #include "url/gurl.h" | 14 #include "url/gurl.h" |
| 15 | 15 |
| 16 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { | 16 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { |
| 17 protected: | 17 protected: |
| 18 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 18 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 19 ExtensionApiTest::SetUpCommandLine(command_line); | 19 ExtensionApiTest::SetUpCommandLine(command_line); |
| 20 command_line->AppendSwitch(switches::kAllowLegacyExtensionManifests); | 20 command_line->AppendSwitch( |
| 21 extensions::switches::kAllowLegacyExtensionManifests); |
| 21 } | 22 } |
| 22 }; | 23 }; |
| 23 | 24 |
| 24 // Note, this mostly tests the logic of chrome/renderer/extensions/ | 25 // Note, this mostly tests the logic of chrome/renderer/extensions/ |
| 25 // extension_resource_request_policy.*, but we have it as a browser test so that | 26 // extension_resource_request_policy.*, but we have it as a browser test so that |
| 26 // can make sure it works end-to-end. | 27 // can make sure it works end-to-end. |
| 27 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { | 28 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { |
| 28 host_resolver()->AddRule("*", "127.0.0.1"); | 29 host_resolver()->AddRule("*", "127.0.0.1"); |
| 29 ASSERT_TRUE(test_server()->Start()); | 30 ASSERT_TRUE(test_server()->Start()); |
| 30 ASSERT_TRUE(LoadExtensionWithFlags(test_data_dir_ | 31 ASSERT_TRUE(LoadExtensionWithFlags(test_data_dir_ |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 | 268 |
| 268 #if defined(OS_MACOSX) | 269 #if defined(OS_MACOSX) |
| 269 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources | 270 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
| 270 #else | 271 #else |
| 271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 272 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
| 272 #endif | 273 #endif |
| 273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 274 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
| 274 MAYBE_ExtensionAccessibleResources) { | 275 MAYBE_ExtensionAccessibleResources) { |
| 275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 276 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
| 276 } | 277 } |
| OLD | NEW |