diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 01:10:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 01:10:00 +0000 |
| commit | cb04f5e5c0daa653804170001499efb72dc610e5 (patch) | |
| tree | f87b2e073aaacb155f4ba8fe2cf939383334c76b /chrome/test | |
| parent | a26727ffaf49d677a030960d6ec8f14dbbfd98d3 (diff) | |
| download | chromium_src-cb04f5e5c0daa653804170001499efb72dc610e5.zip chromium_src-cb04f5e5c0daa653804170001499efb72dc610e5.tar.gz chromium_src-cb04f5e5c0daa653804170001499efb72dc610e5.tar.bz2 | |
net: Move ResponseCookies into the net namespace.
BUG=81612
TEST=None
R=wtc@chromium.org,willchan@chromium.org
Review URL: http://codereview.chromium.org/6932025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/live_sync/live_sync_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index 89bd656..b22cc03 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -11,11 +11,11 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/values.h" -#include "base/synchronization/waitable_event.h" #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -23,8 +23,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/test_url_fetcher_factory.h" +#include "chrome/common/net/url_fetcher.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/browser_thread.h" @@ -32,10 +32,10 @@ #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/network_change_notifier.h" -#include "net/test/test_server.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" +#include "net/test/test_server.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" @@ -66,7 +66,7 @@ class SyncServerStatusChecker : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { running_ = (status.status() == net::URLRequestStatus::SUCCESS && response_code == 200 && data.find("ok") == 0); |