Adding SSL ETS Tests

chrome/browser/net/load_timing_browsertest.cc

 // Copyright (c) 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/load_timing_info.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "url/gurl.h"
 
 // This file tests that net::LoadTimingInfo is correctly hooked up to the
 // NavigationTiming API.  It depends on behavior in a large number of files
 // spread across multiple projects, so is somewhat arbitrarily put in
 // chrome/browser/net.
 
@@ skipping 528 matching lines @@
             navigation_deltas.send_start.GetDelta());
 
   EXPECT_LT(navigation_deltas.send_start.GetDelta(),
             navigation_deltas.receive_headers_end.GetDelta());
   EXPECT_LT(navigation_deltas.send_start.GetDelta(),
             navigation_deltas.receive_headers_end.GetDelta());
 }
 
 // Integration test with a real network response.
 IN_PROC_BROWSER_TEST_F(LoadTimingBrowserTest, Integration) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(spawned_test_server()->Start());
   TimingDeltas navigation_deltas;
-  RunTestWithUrl(test_server()->GetURL("chunked?waitBeforeHeaders=100"),
+  RunTestWithUrl(spawned_test_server()->GetURL("chunked?waitBeforeHeaders=100"),
                  &navigation_deltas);
 
   // Due to potential roundoff issues, never check exact differences.
   EXPECT_LE(navigation_deltas.dns_start.GetDelta(),
             navigation_deltas.dns_end.GetDelta());
   EXPECT_LE(navigation_deltas.dns_end.GetDelta(),
             navigation_deltas.connect_start.GetDelta());
   EXPECT_LE(navigation_deltas.connect_start.GetDelta(),
             navigation_deltas.connect_end.GetDelta());
   EXPECT_LE(navigation_deltas.connect_end.GetDelta(),
             navigation_deltas.send_start.GetDelta());
   // The only times that are guaranteed to be distinct are send_start and
   // received_headers_end.
   EXPECT_LT(navigation_deltas.send_start.GetDelta(),
             navigation_deltas.receive_headers_end.GetDelta());
 
   EXPECT_TRUE(navigation_deltas.ssl_start.is_null());
 }
 
 }  // namespace