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

Side by Side Diff: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

Issue 136583007: Refactor prerender_browsertests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and switch some CHECKs to ASSERT_TRUE Created 6 years, 11 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 "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h" 5 #include "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/strings/stringprintf.h"
12 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/io_thread.h" 16 #include "chrome/browser/io_thread.h"
16 #include "chrome/browser/net/chrome_net_log.h" 17 #include "chrome/browser/net/chrome_net_log.h"
17 #include "chrome/browser/prerender/prerender_manager.h" 18 #include "chrome/browser/prerender/prerender_manager.h"
18 #include "chrome/browser/prerender/prerender_manager_factory.h" 19 #include "chrome/browser/prerender/prerender_manager_factory.h"
19 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/ui/browser.h" 21 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 22 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 net_internals_test_->CreatePrerenderLoaderUrl(GURL(prerender_url)); 269 net_internals_test_->CreatePrerenderLoaderUrl(GURL(prerender_url));
269 ui_test_utils::NavigateToURLWithDisposition( 270 ui_test_utils::NavigateToURLWithDisposition(
270 browser(), 271 browser(),
271 GURL(loader_url), 272 GURL(loader_url),
272 NEW_BACKGROUND_TAB, 273 NEW_BACKGROUND_TAB,
273 ui_test_utils::BROWSER_TEST_NONE); 274 ui_test_utils::BROWSER_TEST_NONE);
274 } 275 }
275 276
276 void NetInternalsTest::MessageHandler::NavigateToPrerender( 277 void NetInternalsTest::MessageHandler::NavigateToPrerender(
277 const base::ListValue* list_value) { 278 const base::ListValue* list_value) {
279 std::string url;
280 ASSERT_TRUE(list_value->GetString(0, &url));
278 content::RenderViewHost* host = 281 content::RenderViewHost* host =
279 browser()->tab_strip_model()->GetWebContentsAt(1)->GetRenderViewHost(); 282 browser()->tab_strip_model()->GetWebContentsAt(1)->GetRenderViewHost();
280 host->ExecuteJavascriptInWebFrame(base::string16(), 283 host->ExecuteJavascriptInWebFrame(
281 base::ASCIIToUTF16("Click()")); 284 base::string16(),
285 base::ASCIIToUTF16(base::StringPrintf("Click('%s')", url.c_str())));
282 } 286 }
283 287
284 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser( 288 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser(
285 const base::ListValue* list_value) { 289 const base::ListValue* list_value) {
286 ASSERT_FALSE(incognito_browser_); 290 ASSERT_FALSE(incognito_browser_);
287 incognito_browser_ = net_internals_test_->CreateIncognitoBrowser(); 291 incognito_browser_ = net_internals_test_->CreateIncognitoBrowser();
288 292
289 // Tell the test harness that creation is complete. 293 // Tell the test harness that creation is complete.
290 base::StringValue command_value("onIncognitoBrowserCreatedForTest"); 294 base::StringValue command_value("onIncognitoBrowserCreatedForTest");
291 web_ui()->CallJavascriptFunction("g_browser.receive", command_value); 295 web_ui()->CallJavascriptFunction("g_browser.receive", command_value);
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 content::WebUIMessageHandler* NetInternalsTest::GetMockMessageHandler() { 414 content::WebUIMessageHandler* NetInternalsTest::GetMockMessageHandler() {
411 return message_handler_.get(); 415 return message_handler_.get();
412 } 416 }
413 417
414 GURL NetInternalsTest::CreatePrerenderLoaderUrl( 418 GURL NetInternalsTest::CreatePrerenderLoaderUrl(
415 const GURL& prerender_url) { 419 const GURL& prerender_url) {
416 EXPECT_TRUE(StartTestServer()); 420 EXPECT_TRUE(StartTestServer());
417 std::vector<net::SpawnedTestServer::StringPair> replacement_text; 421 std::vector<net::SpawnedTestServer::StringPair> replacement_text;
418 replacement_text.push_back( 422 replacement_text.push_back(
419 make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec())); 423 make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec()));
420 replacement_text.push_back(
421 make_pair("REPLACE_WITH_DESTINATION_URL", prerender_url.spec()));
422 std::string replacement_path; 424 std::string replacement_path;
423 EXPECT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements( 425 EXPECT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements(
424 "files/prerender/prerender_loader.html", 426 "files/prerender/prerender_loader.html",
425 replacement_text, 427 replacement_text,
426 &replacement_path)); 428 &replacement_path));
427 GURL url_loader = test_server()->GetURL(replacement_path); 429 GURL url_loader = test_server()->GetURL(replacement_path);
428 return url_loader; 430 return url_loader;
429 } 431 }
430 432
431 bool NetInternalsTest::StartTestServer() { 433 bool NetInternalsTest::StartTestServer() {
432 if (test_server_started_) 434 if (test_server_started_)
433 return true; 435 return true;
434 test_server_started_ = test_server()->Start(); 436 test_server_started_ = test_server()->Start();
435 return test_server_started_; 437 return test_server_started_;
436 } 438 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/test/data/prerender/prerender_events_common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698