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

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

Issue 10822030: Move ui_test_utils::RunMessageLoop to test_utils so that it can be reused by content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 command_line->AppendSwitchPath(switches::kDebugPrint, emf_path_); 60 command_line->AppendSwitchPath(switches::kDebugPrint, emf_path_);
61 } 61 }
62 62
63 protected: 63 protected:
64 void PrintNowTab() { 64 void PrintNowTab() {
65 registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT, 65 registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
66 content::NotificationService::AllSources()); 66 content::NotificationService::AllSources());
67 67
68 TabContents* tab = chrome::GetActiveTabContents(browser()); 68 TabContents* tab = chrome::GetActiveTabContents(browser());
69 tab->print_view_manager()->PrintNow(); 69 tab->print_view_manager()->PrintNow();
70 ui_test_utils::RunMessageLoop(); 70 content::RunMessageLoop();
71 registrar_.RemoveAll(); 71 registrar_.RemoveAll();
72 } 72 }
73 73
74 virtual void Observe(int type, 74 virtual void Observe(int type,
75 const content::NotificationSource& source, 75 const content::NotificationSource& source,
76 const content::NotificationDetails& details) { 76 const content::NotificationDetails& details) {
77 DCHECK(type == chrome::NOTIFICATION_PRINT_JOB_EVENT); 77 DCHECK(type == chrome::NOTIFICATION_PRINT_JOB_EVENT);
78 switch (content::Details<printing::JobEventDetails>(details)->type()) { 78 switch (content::Details<printing::JobEventDetails>(details)->type()) {
79 case printing::JobEventDetails::JOB_DONE: { 79 case printing::JobEventDetails::JOB_DONE: {
80 // Succeeded. 80 // Succeeded.
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 455
456 // Force a navigation elsewhere to verify that it's fine with it. 456 // Force a navigation elsewhere to verify that it's fine with it.
457 url = test_server()->GetURL("files/printing/test1.html"); 457 url = test_server()->GetURL("files/printing/test1.html");
458 ui_test_utils::NavigateToURL(browser(), url); 458 ui_test_utils::NavigateToURL(browser(), url);
459 } 459 }
460 chrome::CloseWindow(browser()); 460 chrome::CloseWindow(browser());
461 ui_test_utils::RunAllPendingInMessageLoop(); 461 ui_test_utils::RunAllPendingInMessageLoop();
462 462
463 EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe"; 463 EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
464 } 464 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698