Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Side by Side Diff: trunk/src/chrome/browser/extensions/extension_tabs_apitest.cc

Issue 15039010: Revert 198781 "Disables ExtensionApiTest.CaptureVisibleNoFile on..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/prefs/incognito_mode_prefs.h" 8 #include "chrome/browser/prefs/incognito_mode_prefs.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 "test_png.html")) << message_; 181 "test_png.html")) << message_;
182 } 182 }
183 183
184 // Times out on non-Windows. 184 // Times out on non-Windows.
185 // See http://crbug.com/80212 185 // See http://crbug.com/80212
186 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabRace) { 186 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_CaptureVisibleTabRace) {
187 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 187 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
188 "test_race.html")) << message_; 188 "test_race.html")) << message_;
189 } 189 }
190 190
191 // http://crbug.com/238775 191 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleFile) {
192 #if defined(OS_WIN)
193 #define MAYBE_CaptureVisibleFile DISABLED_CaptureVisibleFile
194 #else
195 #define MAYBE_CaptureVisibleFile CaptureVisibleFile
196 #endif
197 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleFile) {
198 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 192 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
199 "test_file.html")) << message_; 193 "test_file.html")) << message_;
200 } 194 }
201 195
202 // Flaky on windows: http://crbug.com/238667 196 // Flaky on windows: http://crbug.com/238667
203 #if defined(OS_WIN) 197 #if defined(OS_WIN)
204 #define MAYBE_CaptureVisibleNoFile DISABLED_CaptureVisibleNoFile 198 #define MAYBE_CaptureVisibleNoFile DISABLED_CaptureVisibleNoFile
205 #else 199 #else
206 #define MAYBE_CaptureVisibleNoFile CaptureVisibleNoFile 200 #define MAYBE_CaptureVisibleNoFile CaptureVisibleNoFile
207 #endif 201 #endif
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 << message_; 269 << message_;
276 } 270 }
277 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { 271 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) {
278 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) 272 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html"))
279 << message_; 273 << message_;
280 } 274 }
281 275
282 // Adding a new test? Awesome. But API tests are the old hotness. The 276 // Adding a new test? Awesome. But API tests are the old hotness. The
283 // new hotness is extension_test_utils. See tabs_test.cc for an example. 277 // new hotness is extension_test_utils. See tabs_test.cc for an example.
284 // We are trying to phase out many uses of API tests as they tend to be flaky. 278 // We are trying to phase out many uses of API tests as they tend to be flaky.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698