Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

chrome/browser/safe_browsing/safe_browsing_test.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.
 //
 // This test uses the safebrowsing test server published at
 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing
 // protocol implemetation. Details of the safebrowsing testing flow is
 // documented at
 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting
 //
@@ skipping 30 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/load_flags.h"
 #include "net/dns/host_resolver.h"
 #include "net/log/net_log.h"
 #include "net/test/python_utils.h"
+#include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 #ifndef SAFE_BROWSING_DB_LOCAL
 #error This test requires the SAFE_BROWSING_DB_LOCAL implementation.
 #endif
@@ skipping 186 matching lines @@
 
   bool is_update_scheduled() {
     base::AutoLock l(update_status_mutex_);
     return is_update_scheduled_;
   }
 
   scoped_refptr<base::SequencedTaskRunner> SafeBrowsingTaskRunner() {
     return local_database_manager()->safe_browsing_task_runner_;
   }
 
-  const net::SpawnedTestServer& test_server() const {
+  const net::SpawnedTestServer& spawned_test_server() const {
     return *test_server_;
   }
 
  protected:
   bool InitSafeBrowsingService() {
     safe_browsing_service_ = g_browser_process->safe_browsing_service();
     return safe_browsing_service_ != NULL;
   }
 
   void SetUp() override {
@@ skipping 265 matching lines @@
     safe_browsing_helper->UpdateStatus();
     EXPECT_TRUE(is_database_ready());
     EXPECT_FALSE(is_update_scheduled());
     EXPECT_FALSE(last_update().is_null());
     if (last_update() < now) {
       // This means no data available anymore.
       break;
     }
 
     // Fetches URLs to verify and waits till server responses with data.
-    EXPECT_EQ(net::URLRequestStatus::SUCCESS,
-              safe_browsing_helper->FetchUrlsToVerify(test_server(), step));
+    EXPECT_EQ(
+        net::URLRequestStatus::SUCCESS,
+        safe_browsing_helper->FetchUrlsToVerify(spawned_test_server(), step));
 
     std::vector<PhishingUrl> phishing_urls;
     EXPECT_TRUE(ParsePhishingUrls(safe_browsing_helper->response_data(),
                                   &phishing_urls));
     EXPECT_GT(phishing_urls.size(), 0U);
     for (size_t j = 0; j < phishing_urls.size(); ++j) {
       // Verifes with server if a URL is a phishing URL and waits till server
       // responses.
       safe_browsing_helper->CheckUrl(GURL(phishing_urls[j].url));
       if (phishing_urls[j].is_phishing) {
         EXPECT_TRUE(is_checked_url_in_db())
             << phishing_urls[j].url
             << " is_phishing: " << phishing_urls[j].is_phishing
             << " test step: " << step;
         EXPECT_FALSE(is_checked_url_safe())
             << phishing_urls[j].url
             << " is_phishing: " << phishing_urls[j].is_phishing
             << " test step: " << step;
       } else {
         EXPECT_TRUE(is_checked_url_safe())
             << phishing_urls[j].url
             << " is_phishing: " << phishing_urls[j].is_phishing
             << " test step: " << step;
       }
     }
     // TODO(lzheng): We should verify the fetched database with local
     // database to make sure they match.
-    EXPECT_EQ(net::URLRequestStatus::SUCCESS,
-              safe_browsing_helper->FetchDBToVerify(test_server(), step));
+    EXPECT_EQ(
+        net::URLRequestStatus::SUCCESS,
+        safe_browsing_helper->FetchDBToVerify(spawned_test_server(), step));
     EXPECT_GT(safe_browsing_helper->response_data().size(), 0U);
     last_step = step;
   }
 
   // Verifies with server if test is done and waits till server responses.
   EXPECT_EQ(net::URLRequestStatus::SUCCESS,
-            safe_browsing_helper->VerifyTestComplete(test_server(), last_step));
+            safe_browsing_helper->VerifyTestComplete(spawned_test_server(),
+                                                     last_step));
   EXPECT_EQ("yes", safe_browsing_helper->response_data());
 }
 
 }  // namespace safe_browsing