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

Side by Side Diff: content/shell/webkit_test_controller.cc

Issue 18346011: layout test local state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « content/shell/shell_browser_main.cc ('k') | 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 "content/shell/webkit_test_controller.h" 5 #include "content/shell/webkit_test_controller.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 printer_->PrintTextFooter(); 279 printer_->PrintTextFooter();
280 printer_->PrintImageFooter(); 280 printer_->PrintImageFooter();
281 send_configuration_to_next_host_ = false; 281 send_configuration_to_next_host_ = false;
282 test_phase_ = BETWEEN_TESTS; 282 test_phase_ = BETWEEN_TESTS;
283 is_compositing_test_ = false; 283 is_compositing_test_ = false;
284 enable_pixel_dumping_ = false; 284 enable_pixel_dumping_ = false;
285 expected_pixel_hash_.clear(); 285 expected_pixel_hash_.clear();
286 test_url_ = GURL(); 286 test_url_ = GURL();
287 prefs_ = WebPreferences(); 287 prefs_ = WebPreferences();
288 should_override_prefs_ = false; 288 should_override_prefs_ = false;
289
290 DiscardMainWindow();
289 return true; 291 return true;
290 } 292 }
291 293
292 void WebKitTestController::SetTempPath(const base::FilePath& temp_path) { 294 void WebKitTestController::SetTempPath(const base::FilePath& temp_path) {
293 temp_path_ = temp_path; 295 temp_path_ = temp_path;
294 } 296 }
295 297
296 void WebKitTestController::RendererUnresponsive() { 298 void WebKitTestController::RendererUnresponsive() {
297 DCHECK(CalledOnValidThread()); 299 DCHECK(CalledOnValidThread());
298 LOG(WARNING) << "renderer unresponsive"; 300 LOG(WARNING) << "renderer unresponsive";
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 } 616 }
615 base::MessageLoop::current()->RunUntilIdle(); 617 base::MessageLoop::current()->RunUntilIdle();
616 } 618 }
617 619
618 void WebKitTestController::OnResetDone() { 620 void WebKitTestController::OnResetDone() {
619 base::MessageLoop::current()->PostTask(FROM_HERE, 621 base::MessageLoop::current()->PostTask(FROM_HERE,
620 base::MessageLoop::QuitClosure()); 622 base::MessageLoop::QuitClosure());
621 } 623 }
622 624
623 } // namespace content 625 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_browser_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698