diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 21:44:12 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 21:44:12 +0000 |
| commit | 3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch) | |
| tree | aa092101b582f5a9973fc68cce625834a9436c86 /chrome/browser/chromeos | |
| parent | 4ada238a76785ee78396cfb8e5992044c302de1e (diff) | |
| download | chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.zip chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.gz chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.bz2 | |
GTTF: Move more test server code from net/url_request/url_request_unittest.h
to net/test/test_server.h
No code changes, just a move.
TEST=none
BUG=49680
Review URL: http://codereview.chromium.org/3034038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
3 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc index 5f39335..e43781b 100644 --- a/chrome/browser/chromeos/login/account_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc @@ -14,6 +14,7 @@ #include "chrome/test/ui_test_utils.h" #include "net/url_request/url_request_about_job.h" #include "net/url_request/url_request_filter.h" +#include "net/test/test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -27,7 +28,7 @@ class AccountScreenTest : public WizardInProcessBrowserTest { protected: // Overridden from WizardInProcessBrowserTest: virtual void SetUpWizard() { - HTTPTestServer* server = StartHTTPServer(); + net::HTTPTestServer* server = StartHTTPServer(); ASSERT_TRUE(server != NULL); GURL new_account_page_url(server->TestServerPage("files/new_account.html")); AccountScreen::set_new_account_page_url(new_account_page_url); diff --git a/chrome/browser/chromeos/notifications/notification_browsertest.cc b/chrome/browser/chromeos/notifications/notification_browsertest.cc index a1e1152..fc35d4a2 100644 --- a/chrome/browser/chromeos/notifications/notification_browsertest.cc +++ b/chrome/browser/chromeos/notifications/notification_browsertest.cc @@ -5,6 +5,8 @@ #include "app/x11_util.h" #include "base/message_loop.h" #include "base/ref_counted.h" +#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view_browsertest.cc b/chrome/browser/chromeos/options/wifi_config_view_browsertest.cc index 07e846e..468328a 100644 --- a/chrome/browser/chromeos/options/wifi_config_view_browsertest.cc +++ b/chrome/browser/chromeos/options/wifi_config_view_browsertest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/options/wifi_config_view.h" +#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" |