Adding SSL ETS Tests

chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.h"
 #include "components/net_log/chrome_net_log.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
 #include "net/dns/host_cache.h"
 #include "net/dns/host_resolver.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/log/net_log.h"
 #include "net/log/write_to_file_net_log_observer.h"
+#include "net/test/embedded_test_server/request_handler_util.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using content::WebUIMessageHandler;
 
 namespace {
 
@@ skipping 132 matching lines @@
 void NetInternalsTest::MessageHandler::RunJavascriptCallback(
     base::Value* value) {
   web_ui()->CallJavascriptFunction("NetInternalsTest.callback", *value);
 }
 
 void NetInternalsTest::MessageHandler::GetTestServerURL(
     const base::ListValue* list_value) {
   ASSERT_TRUE(net_internals_test_->StartTestServer());
   std::string path;
   ASSERT_TRUE(list_value->GetString(0, &path));
-  GURL url = net_internals_test_->test_server()->GetURL(path);
+  GURL url = net_internals_test_->embedded_test_server()->GetURL(path);
   scoped_ptr<base::Value> url_value(new base::StringValue(url.spec()));
   RunJavascriptCallback(url_value.get());
 }
 
 void NetInternalsTest::MessageHandler::AddCacheEntry(
     const base::ListValue* list_value) {
   std::string hostname;
   std::string ip_literal;
   double net_error;
   double expire_days_from_now;
@@ skipping 140 matching lines @@
   prerender_manager->mutable_config().max_bytes = 1000 * 1024 * 1024;
 }
 
 content::WebUIMessageHandler* NetInternalsTest::GetMockMessageHandler() {
   return message_handler_.get();
 }
 
 GURL NetInternalsTest::CreatePrerenderLoaderUrl(
     const GURL& prerender_url) {
   EXPECT_TRUE(StartTestServer());
-  std::vector<net::SpawnedTestServer::StringPair> replacement_text;
+  base::StringPairs replacement_text;
   replacement_text.push_back(
       make_pair("REPLACE_WITH_PRERENDER_URL", prerender_url.spec()));
   std::string replacement_path;
-  EXPECT_TRUE(net::SpawnedTestServer::GetFilePathWithReplacements(
-      "files/prerender/prerender_loader.html",
-      replacement_text,
-      &replacement_path));
-  GURL url_loader = test_server()->GetURL(replacement_path);
+  net::test_server::GetFilePathWithReplacements(
+      "/prerender/prerender_loader.html", replacement_text, &replacement_path);
+  GURL url_loader = embedded_test_server()->GetURL(replacement_path);
   return url_loader;
 }
 
 bool NetInternalsTest::StartTestServer() {
   if (test_server_started_)
     return true;
-  test_server_started_ = test_server()->Start();
+  test_server_started_ = embedded_test_server()->Start();
 
   // Sample domain for SDCH-view test. Dictionaries for localhost/127.0.0.1
   // are forbidden.
   host_resolver()->AddRule("testdomain.com", "127.0.0.1");
   host_resolver()->AddRule("sub.testdomain.com", "127.0.0.1");
   return test_server_started_;
 }