| OLD | NEW |
| 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_path.h" | 10 #include "base/file_path.h" |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 net_internals_test_->CreatePrerenderLoaderUrl(GURL(prerender_url)); | 237 net_internals_test_->CreatePrerenderLoaderUrl(GURL(prerender_url)); |
| 238 ui_test_utils::NavigateToURLWithDisposition( | 238 ui_test_utils::NavigateToURLWithDisposition( |
| 239 browser(), | 239 browser(), |
| 240 GURL(loader_url), | 240 GURL(loader_url), |
| 241 NEW_BACKGROUND_TAB, | 241 NEW_BACKGROUND_TAB, |
| 242 ui_test_utils::BROWSER_TEST_NONE); | 242 ui_test_utils::BROWSER_TEST_NONE); |
| 243 } | 243 } |
| 244 | 244 |
| 245 void NetInternalsTest::MessageHandler::NavigateToPrerender( | 245 void NetInternalsTest::MessageHandler::NavigateToPrerender( |
| 246 const ListValue* list_value) { | 246 const ListValue* list_value) { |
| 247 RenderViewHost* host = browser()->GetWebContentsAt(1)->GetRenderViewHost(); | 247 content::RenderViewHost* host = |
| 248 browser()->GetWebContentsAt(1)->GetRenderViewHost(); |
| 248 host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("Click()")); | 249 host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("Click()")); |
| 249 } | 250 } |
| 250 | 251 |
| 251 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser( | 252 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser( |
| 252 const ListValue* list_value) { | 253 const ListValue* list_value) { |
| 253 ASSERT_FALSE(incognito_browser_); | 254 ASSERT_FALSE(incognito_browser_); |
| 254 incognito_browser_ = net_internals_test_->CreateIncognitoBrowser(); | 255 incognito_browser_ = net_internals_test_->CreateIncognitoBrowser(); |
| 255 | 256 |
| 256 // Tell the test harness that creation is complete. | 257 // Tell the test harness that creation is complete. |
| 257 StringValue command_value("onIncognitoBrowserCreatedForTest"); | 258 StringValue command_value("onIncognitoBrowserCreatedForTest"); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 GURL url_loader = test_server()->GetURL(replacement_path); | 348 GURL url_loader = test_server()->GetURL(replacement_path); |
| 348 return url_loader; | 349 return url_loader; |
| 349 } | 350 } |
| 350 | 351 |
| 351 bool NetInternalsTest::StartTestServer() { | 352 bool NetInternalsTest::StartTestServer() { |
| 352 if (test_server_started_) | 353 if (test_server_started_) |
| 353 return true; | 354 return true; |
| 354 test_server_started_ = test_server()->Start(); | 355 test_server_started_ = test_server()->Start(); |
| 355 return test_server_started_; | 356 return test_server_started_; |
| 356 } | 357 } |
| OLD | NEW |