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

Unified Diff: net/websockets/websocket_channel_test.cc

Issue 657013003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « net/test/embedded_test_server/embedded_test_server_unittest.cc ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_channel_test.cc
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
index 6535741c2f63303540081272001249057749b486..c7bfeb0b65b08bd03a5a96bb5a19a6c7bb208e2a 100644
--- a/net/websockets/websocket_channel_test.cc
+++ b/net/websockets/websocket_channel_test.cc
@@ -780,10 +780,7 @@ class WebSocketChannelTest : public ::testing::Test {
// will have unpleasant compile errors.
template <class T>
void set_stream(scoped_ptr<T> stream) {
- // Since the definition of "PassAs" depends on the type T, the C++ standard
- // requires the "template" keyword to indicate that "PassAs" should be
- // parsed as a template method.
- stream_ = stream.template PassAs<WebSocketStream>();
+ stream_ = stream.Pass();
}
// A struct containing the data that will be used to connect the channel.
« no previous file with comments | « net/test/embedded_test_server/embedded_test_server_unittest.cc ('k') | net/websockets/websocket_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698