diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 04:19:30 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 04:19:30 +0000 |
| commit | 27a112c2e8c464ddd4aed5e1f425204bb3f96d54 (patch) | |
| tree | a02d4a66a90a040a04aa64cb94948c8e7df59658 /chrome/test | |
| parent | e79cf09fd1bd403396a65a3c02642b075ec3d1d9 (diff) | |
| download | chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.zip chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.gz chromium_src-27a112c2e8c464ddd4aed5e1f425204bb3f96d54.tar.bz2 | |
net: Add namespace net to the remaining files under url_request directory.
It just adds the 'namespace net' to these files and a typedef for them, because there are many
entries to fix in one pass. They will be fixed later.
BUG=64263
TEST=trybots
Review URL: http://codereview.chromium.org/6056007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.h | 8 | ||||
| -rw-r--r-- | chrome/test/test_url_request_context_getter.h | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.h b/chrome/test/automation/automation_proxy_uitest.h index 0b5556f..c08aa91 100644 --- a/chrome/test/automation/automation_proxy_uitest.h +++ b/chrome/test/automation/automation_proxy_uitest.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -45,7 +45,7 @@ class ExternalTabUITestMockClient : public AutomationProxy { MOCK_METHOD2(OnRequestRead, void(int request_id, int bytes_to_read)); MOCK_METHOD2(OnRequestEnd, void(int request_id, - const URLRequestStatus& status)); + const net::URLRequestStatus& status)); MOCK_METHOD2(OnSetCookieAsync, void(const GURL& url, const std::string& cookie)); MOCK_METHOD1(HandleClosed, void(int handle)); @@ -67,7 +67,9 @@ class ExternalTabUITestMockClient : public AutomationProxy { int tab_handle, int request_id); void ReplyData(const std::string* data, int tab_handle, int request_id); void ReplyEOF(int tab_handle, int request_id); - void ReplyEnd(const URLRequestStatus& status, int tab_handle, int request_id); + void ReplyEnd(const net::URLRequestStatus& status, + int tab_handle, + int request_id); void Reply404(int tab_handle, int request_id); // Test setup helpers diff --git a/chrome/test/test_url_request_context_getter.h b/chrome/test/test_url_request_context_getter.h index 8ac7b05..61dc327 100644 --- a/chrome/test/test_url_request_context_getter.h +++ b/chrome/test/test_url_request_context_getter.h @@ -1,9 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. #ifndef CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_ #define CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_ +#pragma once #include "base/ref_counted.h" #include "chrome/browser/browser_thread.h" @@ -17,7 +18,7 @@ // special trait that deletes it on the IO thread. class TestURLRequestContextGetter : public URLRequestContextGetter { public: - virtual URLRequestContext* GetURLRequestContext() { + virtual net::URLRequestContext* GetURLRequestContext() { if (!context_) context_ = new TestURLRequestContext(); return context_.get(); @@ -27,7 +28,7 @@ class TestURLRequestContextGetter : public URLRequestContextGetter { } private: - scoped_refptr<URLRequestContext> context_; + scoped_refptr<net::URLRequestContext> context_; }; #endif // CHROME_TEST_TEST_URL_REQUEST_CONTEXT_GETTER_H_ |