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" |
11 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
13 #include "content/public/test/browser_test_utils.h" | 13 #include "content/public/test/browser_test_utils.h" |
14 #include "extensions/common/switches.h" | 14 #include "extensions/common/switches.h" |
15 #include "net/dns/mock_host_resolver.h" | 15 #include "net/dns/mock_host_resolver.h" |
16 #include "url/gurl.h" | 16 #include "url/gurl.h" |
17 | 17 |
18 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { | 18 class ExtensionResourceRequestPolicyTest : public ExtensionApiTest { |
19 protected: | 19 protected: |
| 20 virtual void SetUp() OVERRIDE { |
| 21 // TODO(danakj): The GPU Video Decoder needs real GL bindings. |
| 22 // crbug.com/269087 |
| 23 UseRealGLBindings(); |
| 24 |
| 25 ExtensionApiTest::SetUp(); |
| 26 } |
| 27 |
20 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 28 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
21 ExtensionApiTest::SetUpCommandLine(command_line); | 29 ExtensionApiTest::SetUpCommandLine(command_line); |
22 command_line->AppendSwitch( | 30 command_line->AppendSwitch( |
23 extensions::switches::kAllowLegacyExtensionManifests); | 31 extensions::switches::kAllowLegacyExtensionManifests); |
24 } | 32 } |
25 }; | 33 }; |
26 | 34 |
27 // Note, this mostly tests the logic of chrome/renderer/extensions/ | 35 // Note, this mostly tests the logic of chrome/renderer/extensions/ |
28 // extension_resource_request_policy.*, but we have it as a browser test so that | 36 // extension_resource_request_policy.*, but we have it as a browser test so that |
29 // can make sure it works end-to-end. | 37 // can make sure it works end-to-end. |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 | 284 |
277 #if defined(OS_MACOSX) | 285 #if defined(OS_MACOSX) |
278 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources | 286 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources |
279 #else | 287 #else |
280 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources | 288 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources |
281 #endif | 289 #endif |
282 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, | 290 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, |
283 MAYBE_ExtensionAccessibleResources) { | 291 MAYBE_ExtensionAccessibleResources) { |
284 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; | 292 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; |
285 } | 293 } |
OLD | NEW |