Removing test_server() and switching over to embedded_test_server.

content/public/test/browser_test_base.h

Index: content/public/test/browser_test_base.h
diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h
index 781d836e530b1ba2348e66936e412c25b4052b74..23abda8d2579a2dadaa9030e9ec004797081429d 100644
--- a/content/public/test/browser_test_base.h
+++ b/content/public/test/browser_test_base.h
@@ -81,13 +81,6 @@ class BrowserTestBase : public testing::Test {
   // 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();
   }