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 30 matching lines...) Expand all Loading... |
41 CommandLine::ForCurrentProcess()->AppendSwitchASCII( | 41 CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
42 switches::kWhitelistedExtensionID, kExtensionId); | 42 switches::kWhitelistedExtensionID, kExtensionId); |
43 } | 43 } |
44 }; | 44 }; |
45 | 45 |
46 } // namespace | 46 } // namespace |
47 | 47 |
48 // http://crbug.com/261493 and http://crbug.com/268644 | 48 // http://crbug.com/261493 and http://crbug.com/268644 |
49 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_AURA) | 49 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(USE_AURA) |
50 #define MAYBE_ApiTests DISABLED_ApiTests | 50 #define MAYBE_ApiTests DISABLED_ApiTests |
| 51 #elif defined(OS_WIN) |
| 52 // http://crbug.com/263951 |
| 53 #define MAYBE_ApiTests DISABLED_ApiTests |
51 #else | 54 #else |
52 #define MAYBE_ApiTests ApiTests | 55 #define MAYBE_ApiTests ApiTests |
53 #endif | 56 #endif |
54 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTests) { | 57 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTests) { |
55 #if defined(OS_WIN) && defined(USE_ASH) | 58 #if defined(OS_WIN) && defined(USE_ASH) |
56 // Disable this test in Metro+Ash for now (http://crbug.com/262796). | 59 // Disable this test in Metro+Ash for now (http://crbug.com/262796). |
57 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) | 60 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) |
58 return; | 61 return; |
59 #endif | 62 #endif |
60 | 63 |
61 #if defined(OS_WIN) | 64 #if defined(OS_WIN) |
62 // TODO(justinlin): Disabled for WinXP due to timeout issues. | 65 // TODO(justinlin): Disabled for WinXP due to timeout issues. |
63 if (base::win::GetVersion() < base::win::VERSION_VISTA) { | 66 if (base::win::GetVersion() < base::win::VERSION_VISTA) { |
64 return; | 67 return; |
65 } | 68 } |
66 #endif | 69 #endif |
67 | 70 |
68 AddExtensionToCommandLineWhitelist(); | 71 AddExtensionToCommandLineWhitelist(); |
69 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", | 72 ASSERT_TRUE(RunExtensionSubtest("tab_capture/experimental", |
70 "api_tests.html")) << message_; | 73 "api_tests.html")) << message_; |
71 } | 74 } |
72 | 75 |
73 // http://crbug.com/268644 | 76 // http://crbug.com/268644 |
74 #if defined(USE_AURA) | 77 #if defined(USE_AURA) |
75 #define MAYBE_ApiTestsAudio DISABLED_ApiTestsAudio | 78 #define MAYBE_ApiTestsAudio DISABLED_ApiTestsAudio |
| 79 #elif defined(OS_WIN) |
| 80 // http://crbug.com/263951 |
| 81 #define MAYBE_ApiTestsAudio DISABLED_ApiTestsAudio |
76 #else | 82 #else |
77 #define MAYBE_ApiTestsAudio ApiTestsAudio | 83 #define MAYBE_ApiTestsAudio ApiTestsAudio |
78 #endif | 84 #endif |
79 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTestsAudio) { | 85 IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_ApiTestsAudio) { |
80 #if defined(OS_WIN) | 86 #if defined(OS_WIN) |
81 // TODO(justinlin): Disabled for WinXP due to timeout issues. | 87 // TODO(justinlin): Disabled for WinXP due to timeout issues. |
82 if (base::win::GetVersion() < base::win::VERSION_VISTA) { | 88 if (base::win::GetVersion() < base::win::VERSION_VISTA) { |
83 return; | 89 return; |
84 } | 90 } |
85 #endif | 91 #endif |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents, | 248 browser()->fullscreen_controller()->ToggleFullscreenModeForTab(web_contents, |
243 false); | 249 false); |
244 fullscreen_entered.Reply(""); | 250 fullscreen_entered.Reply(""); |
245 | 251 |
246 ResultCatcher catcher; | 252 ResultCatcher catcher; |
247 catcher.RestrictToProfile(browser()->profile()); | 253 catcher.RestrictToProfile(browser()->profile()); |
248 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 254 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
249 } | 255 } |
250 | 256 |
251 } // namespace chrome | 257 } // namespace chrome |
OLD | NEW |