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

Side by Side Diff: content/test/layouttest_support.cc

Issue 264003003: test_runner: Move everything else into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « content/shell/renderer/webkit_test_runner.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/public/test/layouttest_support.h" 5 #include "content/public/test/layouttest_support.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "content/browser/renderer_host/render_widget_host_impl.h" 9 #include "content/browser/renderer_host/render_widget_host_impl.h"
10 #include "content/common/gpu/image_transport_surface.h" 10 #include "content/common/gpu/image_transport_surface.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 std::string result; 186 std::string result;
187 187
188 const blink::WebHistoryItem& item = node->item(); 188 const blink::WebHistoryItem& item = node->item();
189 if (is_current_index) { 189 if (is_current_index) {
190 result.append("curr->"); 190 result.append("curr->");
191 result.append(indent - 6, ' '); // 6 == "curr->".length() 191 result.append(indent - 6, ' '); // 6 == "curr->".length()
192 } else { 192 } else {
193 result.append(indent, ' '); 193 result.append(indent, ' ');
194 } 194 }
195 195
196 std::string url = 196 std::string url = normalizeLayoutTestURL(item.urlString().utf8());
197 WebTestRunner::normalizeLayoutTestURL(item.urlString().utf8());
198 result.append(url); 197 result.append(url);
199 if (!item.target().isEmpty()) { 198 if (!item.target().isEmpty()) {
200 result.append(" (in frame \""); 199 result.append(" (in frame \"");
201 result.append(item.target().utf8()); 200 result.append(item.target().utf8());
202 result.append("\")"); 201 result.append("\")");
203 } 202 }
204 result.append("\n"); 203 result.append("\n");
205 204
206 std::vector<HistoryEntry::HistoryNode*> children = node->children(); 205 std::vector<HistoryEntry::HistoryNode*> children = node->children();
207 if (!children.empty()) { 206 if (!children.empty()) {
(...skipping 15 matching lines...) Expand all
223 result.append( 222 result.append(
224 DumpHistoryItem(entry->root_history_node(), 223 DumpHistoryItem(entry->root_history_node(),
225 8, 224 8,
226 index == current_index)); 225 index == current_index));
227 } 226 }
228 result.append("===============================================\n"); 227 result.append("===============================================\n");
229 return result; 228 return result;
230 } 229 }
231 230
232 } // namespace content 231 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/webkit_test_runner.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698