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/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #if defined(OS_MACOSX) | 7 #if defined(OS_MACOSX) |
8 #include "base/mac/mac_util.h" | 8 #include "base/mac/mac_util.h" |
9 #endif | 9 #endif |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 namespace chrome { | 30 namespace chrome { |
31 | 31 |
32 namespace { | 32 namespace { |
33 | 33 |
34 const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf"; | 34 const char kExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf"; |
35 | 35 |
36 class TabCaptureApiTest : public ExtensionApiTest { | 36 class TabCaptureApiTest : public ExtensionApiTest { |
37 public: | 37 public: |
38 TabCaptureApiTest() {} | 38 TabCaptureApiTest() {} |
39 | 39 |
40 virtual void SetUp() OVERRIDE { | |
41 // TODO(danakj): The GPU Video Decoder needs real GL bindings. | |
42 // crbug.com/269087 | |
43 UseRealGLBindings(); | |
44 | |
45 ExtensionApiTest::SetUp(); | |
46 } | |
47 | |
48 void AddExtensionToCommandLineWhitelist() { | 40 void AddExtensionToCommandLineWhitelist() { |
49 CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 41 CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
50 switches::kWhitelistedExtensionID, kExtensionId); | 42 switches::kWhitelistedExtensionID, kExtensionId); |
51 } | 43 } |
52 }; | 44 }; |
53 | 45 |
54 } // namespace | 46 } // namespace |
55 | 47 |
56 // http://crbug.com/261493 and http://crbug.com/268644 | 48 // http://crbug.com/261493 and http://crbug.com/268644 |
57 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_AURA) | 49 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_AURA) |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents, | 242 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents, |
251 false); | 243 false); |
252 fullscreen_entered.Reply(""); | 244 fullscreen_entered.Reply(""); |
253 | 245 |
254 ResultCatcher catcher; | 246 ResultCatcher catcher; |
255 catcher.RestrictToProfile(browser()->profile()); | 247 catcher.RestrictToProfile(browser()->profile()); |
256 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 248 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
257 } | 249 } |
258 | 250 |
259 } // namespace chrome | 251 } // namespace chrome |
OLD | NEW |