Removing test_server() and switching over to embedded_test_server.

content/public/test/browser_test_base.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
@@ skipping 63 matching lines @@
   virtual void RunTestOnMainThread() = 0;
 
   // This is invoked from main after browser_init/browser_main have completed.
   // This prepares for the test by creating a new browser, runs the test
   // (RunTestOnMainThread), quits the browsers and returns.
   virtual void RunTestOnMainThreadLoop() = 0;
 
   // Sets expected browser exit code, in case it's different than 0 (success).
   void set_expected_exit_code(int code) { expected_exit_code_ = code; }
 
-  // Returns the testing server. Guaranteed to be non-NULL.
-  // TODO(phajdan.jr): Remove test_server accessor (http://crbug.com/96594).

[davidben, 2015/11/30 20:29:48]

Might be worth stapling to this bug too.

-  const net::SpawnedTestServer* test_server() const {
-    return spawned_test_server_.get();
-  }
-  net::SpawnedTestServer* test_server() { return spawned_test_server_.get(); }
-
   const net::SpawnedTestServer* spawned_test_server() const {
     return spawned_test_server_.get();
   }
   net::SpawnedTestServer* spawned_test_server() {
     return spawned_test_server_.get();
   }
 
   // Returns the embedded test server. Guaranteed to be non-NULL.
   const net::EmbeddedTestServer* embedded_test_server() const {
     return embedded_test_server_.get();
@@ skipping 61 matching lines @@
   bool set_up_called_;
 
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_