diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 18:57:22 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 18:57:22 +0000 |
| commit | ce7d0cbc07beeac9515f0343c6d56e77ee83879a (patch) | |
| tree | e7fa63e776a5fa9873e735a0b1b31b7c19249945 /chrome/browser/search_engines | |
| parent | 47914ce872d5e3c1901eeeb44c02dd197c01992d (diff) | |
| download | chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.zip chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.tar.gz chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.tar.bz2 | |
GTTF: rename net::TestServer -> net::SpawnedTestServer
This is a part of replacing most usages of the Python test server
with an in-process C++ test server that should be easier to debug.
BUG=96594
R=rch@chromium.org
Review URL: https://codereview.chromium.org/14702004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_fetcher_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc index bdef3dd..5ace411 100644 --- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc +++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc @@ -9,14 +9,14 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_fetcher.h" -#include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_fetcher_callbacks.h" +#include "chrome/browser/search_engines/template_url_fetcher_factory.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" #include "googleurl/src/gurl.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" class TemplateURLFetcherTest; @@ -78,7 +78,7 @@ class TemplateURLFetcherTest : public testing::Test { void WaitForDownloadToFinish(); TemplateURLServiceTestUtil test_util_; - net::TestServer test_server_; + net::SpawnedTestServer test_server_; // The last TemplateURL to come from a callback. scoped_ptr<TemplateURL> last_callback_template_url_; @@ -108,8 +108,8 @@ void TemplateURLFetcherTestCallbacks::ConfirmAddSearchProvider( } TemplateURLFetcherTest::TemplateURLFetcherTest() - : test_server_(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : test_server_(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))), callbacks_destroyed_(0), add_provider_called_(0), |