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

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

Issue 1118183003: content: Rename webkit_test_helpers.{cc,h} to blink_test_helpers.{cc,h} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content/shell/renderer/layout_test Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/webkit_test_controller.h" 5 #include "content/shell/browser/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 15 matching lines...) Expand all
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
28 #include "content/public/common/url_constants.h" 28 #include "content/public/common/url_constants.h"
29 #include "content/shell/browser/layout_test/layout_test_devtools_frontend.h" 29 #include "content/shell/browser/layout_test/layout_test_devtools_frontend.h"
30 #include "content/shell/browser/shell.h" 30 #include "content/shell/browser/shell.h"
31 #include "content/shell/browser/shell_browser_context.h" 31 #include "content/shell/browser/shell_browser_context.h"
32 #include "content/shell/browser/shell_content_browser_client.h" 32 #include "content/shell/browser/shell_content_browser_client.h"
33 #include "content/shell/browser/shell_devtools_frontend.h" 33 #include "content/shell/browser/shell_devtools_frontend.h"
34 #include "content/shell/common/shell_messages.h" 34 #include "content/shell/common/shell_messages.h"
35 #include "content/shell/common/shell_switches.h" 35 #include "content/shell/common/shell_switches.h"
36 #include "content/shell/common/webkit_test_helpers.h" 36 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
37 #include "ui/gfx/codec/png_codec.h" 37 #include "ui/gfx/codec/png_codec.h"
38 38
39 namespace content { 39 namespace content {
40 40
41 const int kTestSVGWindowWidthDip = 480; 41 const int kTestSVGWindowWidthDip = 480;
42 const int kTestSVGWindowHeightDip = 360; 42 const int kTestSVGWindowHeightDip = 360;
43 43
44 // WebKitTestResultPrinter ---------------------------------------------------- 44 // WebKitTestResultPrinter ----------------------------------------------------
45 45
46 WebKitTestResultPrinter::WebKitTestResultPrinter( 46 WebKitTestResultPrinter::WebKitTestResultPrinter(
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 696
697 printer_->AddErrorMessage( 697 printer_->AddErrorMessage(
698 base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_, 698 base::StringPrintf("#LEAK - renderer pid %d (%s)", current_pid_,
699 result.detail.c_str())); 699 result.detail.c_str()));
700 CHECK(!crash_when_leak_found_); 700 CHECK(!crash_when_leak_found_);
701 701
702 DiscardMainWindow(); 702 DiscardMainWindow();
703 } 703 }
704 704
705 } // namespace content 705 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_content_browser_client.cc ('k') | content/shell/common/webkit_test_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698