summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing/safe_browsing_test.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 01:10:00 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 01:10:00 +0000
commitcb04f5e5c0daa653804170001499efb72dc610e5 (patch)
treef87b2e073aaacb155f4ba8fe2cf939383334c76b /chrome/browser/safe_browsing/safe_browsing_test.cc
parenta26727ffaf49d677a030960d6ec8f14dbbfd98d3 (diff)
downloadchromium_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/browser/safe_browsing/safe_browsing_test.cc')
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_test.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc
index 80ba01d..53c65fe 100644
--- a/chrome/browser/safe_browsing/safe_browsing_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_test.cc
@@ -21,9 +21,10 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_number_conversions.h"
-#include "base/string_util.h"
#include "base/string_split.h"
+#include "base/string_util.h"
#include "base/synchronization/lock.h"
+#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
@@ -34,10 +35,9 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/in_process_browser_test.h"
+#include "chrome/test/ui_test_utils.h"
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
-#include "base/test/test_timeouts.h"
-#include "chrome/test/ui_test_utils.h"
#include "net/base/host_resolver.h"
#include "net/base/load_flags.h"
#include "net/base/net_log.h"
@@ -497,7 +497,7 @@ class SafeBrowsingServiceTestHelper
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
response_data_ = data;
response_status_ = status.status();