Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6008)

Unified Diff: chrome_frame/test/automation_client_mock.h

Issue 6056007: net: Add namespace net to the remaining files under url_request directory. (Closed)
Patch Set: chromeos fixes Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/plugin_url_request.h ('k') | chrome_frame/urlmon_url_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/automation_client_mock.h
diff --git a/chrome_frame/test/automation_client_mock.h b/chrome_frame/test/automation_client_mock.h
index 4a25b10c01350736077e1c6c5191c86ecae8801c..39d2f32c718ecb794f4940479801886b0c029d0d 100644
--- a/chrome_frame/test/automation_client_mock.h
+++ b/chrome_frame/test/automation_client_mock.h
@@ -1,6 +1,7 @@
-// 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_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
#define CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
@@ -53,7 +54,7 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
const AutomationURLRequest& request));
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));
@@ -71,13 +72,13 @@ struct MockCFDelegate : public ChromeFrameDelegateImpl {
request_delegate_->OnReadComplete(request_id, *data);
}
- void Reply(const URLRequestStatus& status, int request_id) {
+ void Reply(const net::URLRequestStatus& status, int request_id) {
request_delegate_->OnResponseEnd(request_id, status);
}
void Reply404(int request_id) {
ReplyStarted(request_id, "HTTP/1.1 404\r\n\r\n");
- Reply(URLRequestStatus(), request_id);
+ Reply(net::URLRequestStatus(), request_id);
}
PluginUrlRequestDelegate* request_delegate_;
@@ -180,6 +181,4 @@ class CFACMockTest : public testing::Test {
}
};
-
#endif // CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
-
« no previous file with comments | « chrome_frame/plugin_url_request.h ('k') | chrome_frame/urlmon_url_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698