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

Side by Side Diff: chrome/browser/printing/print_dialog_cloud_uitest.cc

Issue 7740075: Mark PrintDialogCloudTest.HandlersRegistered test flaky on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/printing/print_dialog_cloud.h" 5 #include "chrome/browser/printing/print_dialog_cloud.h"
6 #include "chrome/browser/printing/print_dialog_cloud_internal.h" 6 #include "chrome/browser/printing/print_dialog_cloud_internal.h"
7 7
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 const std::string& scheme) { 218 const std::string& scheme) {
219 if (TestController::GetInstance()->use_delegate()) 219 if (TestController::GetInstance()->use_delegate())
220 request->set_delegate(TestController::GetInstance()->delegate()); 220 request->set_delegate(TestController::GetInstance()->delegate());
221 if (request && 221 if (request &&
222 (request->url() == TestController::GetInstance()->expected_url())) { 222 (request->url() == TestController::GetInstance()->expected_url())) {
223 TestController::GetInstance()->set_result(true); 223 TestController::GetInstance()->set_result(true);
224 } 224 }
225 return new SimpleTestJob(request); 225 return new SimpleTestJob(request);
226 } 226 }
227 227
228 IN_PROC_BROWSER_TEST_F(PrintDialogCloudTest, HandlersRegistered) { 228 #if defined(OS_WIN)
229 // http://crbug.com/94864
230 #define MAYBE_HandlersRegistered FLAKY_HandlersRegistered
231 #else
232 #define MAYBE_HandlersRegistered HandlersRegistered
233 #endif
234 IN_PROC_BROWSER_TEST_F(PrintDialogCloudTest, MAYBE_HandlersRegistered) {
229 BrowserList::SetLastActive(browser()); 235 BrowserList::SetLastActive(browser());
230 ASSERT_TRUE(BrowserList::GetLastActive()); 236 ASSERT_TRUE(BrowserList::GetLastActive());
231 237
232 AddTestHandlers(); 238 AddTestHandlers();
233 239
234 TestController::GetInstance()->set_use_delegate(true); 240 TestController::GetInstance()->set_use_delegate(true);
235 241
236 ui_test_utils::RunMessageLoop(); 242 ui_test_utils::RunMessageLoop();
237 243
238 ASSERT_TRUE(TestController::GetInstance()->result()); 244 ASSERT_TRUE(TestController::GetInstance()->result());
(...skipping 22 matching lines...) Expand all
261 267
262 string16 window_print = ASCIIToUTF16("window.print()"); 268 string16 window_print = ASCIIToUTF16("window.print()");
263 browser()->GetSelectedTabContents()->render_view_host()-> 269 browser()->GetSelectedTabContents()->render_view_host()->
264 ExecuteJavascriptInWebFrame(string16(), window_print); 270 ExecuteJavascriptInWebFrame(string16(), window_print);
265 271
266 ui_test_utils::RunMessageLoop(); 272 ui_test_utils::RunMessageLoop();
267 273
268 ASSERT_TRUE(TestController::GetInstance()->result()); 274 ASSERT_TRUE(TestController::GetInstance()->result());
269 } 275 }
270 #endif 276 #endif
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