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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index 677aadd676e836c4e3672b6ca069568582b0ecda..874901f37dd275c4137e9911f2ff51c7a7138c79 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
@@ -275,10 +276,13 @@ void NetInternalsTest::MessageHandler::PrerenderPage(
void NetInternalsTest::MessageHandler::NavigateToPrerender(
const base::ListValue* list_value) {
+ std::string url;
+ ASSERT_TRUE(list_value->GetString(0, &url));
content::RenderViewHost* host =
browser()->tab_strip_model()->GetWebContentsAt(1)->GetRenderViewHost();
- host->ExecuteJavascriptInWebFrame(base::string16(),
- base::ASCIIToUTF16("Click()"));
+ host->ExecuteJavascriptInWebFrame(
+ base::string16(),
+ base::ASCIIToUTF16(base::StringPrintf("Click('%s')", url.c_str())));
}
void NetInternalsTest::MessageHandler::CreateIncognitoBrowser(
@@ -417,8 +421,6 @@ GURL NetInternalsTest::CreatePrerenderLoaderUrl(
std::vector<net::SpawnedTestServer::StringPair> replacement_text;
replacement_text.push_back(
make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec()));
- replacement_text.push_back(
- make_pair("REPLACE_WITH_DESTINATION_URL", prerender_url.spec()));
std::string replacement_path;
EXPECT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements(
"files/prerender/prerender_loader.html",
« 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