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

Side by Side Diff: chrome/test/chromedriver/net/websocket.cc

Issue 12378016: chrome: Update include paths of string_split.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/chromedriver/commands.cc ('k') | chrome/test/chromedriver/server/http_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/chromedriver/net/websocket.h" 5 #include "chrome/test/chromedriver/net/websocket.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/sha1.h" 10 #include "base/sha1.h"
11 #include "base/string_split.h"
12 #include "base/stringprintf.h" 11 #include "base/stringprintf.h"
12 #include "base/strings/string_split.h"
13 #include "net/base/io_buffer.h" 13 #include "net/base/io_buffer.h"
14 #include "net/http/http_response_headers.h" 14 #include "net/http/http_response_headers.h"
15 #include "net/http/http_util.h" 15 #include "net/http/http_util.h"
16 #include "net/url_request/url_request_context_getter.h" 16 #include "net/url_request/url_request_context_getter.h"
17 #include "net/websockets/websocket_frame.h" 17 #include "net/websockets/websocket_frame.h"
18 #include "net/websockets/websocket_job.h" 18 #include "net/websockets/websocket_job.h"
19 19
20 WebSocket::WebSocket( 20 WebSocket::WebSocket(
21 net::URLRequestContextGetter* context_getter, 21 net::URLRequestContextGetter* context_getter,
22 const GURL& url, 22 const GURL& url,
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 listener_->OnClose(); 141 listener_->OnClose();
142 } 142 }
143 143
144 void WebSocket::OnConnectFinished(net::Error error) { 144 void WebSocket::OnConnectFinished(net::Error error) {
145 if (error == net::OK) 145 if (error == net::OK)
146 connected_ = true; 146 connected_ = true;
147 net::CompletionCallback temp = connect_callback_; 147 net::CompletionCallback temp = connect_callback_;
148 connect_callback_.Reset(); 148 connect_callback_.Reset();
149 temp.Run(error); 149 temp.Run(error);
150 } 150 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/commands.cc ('k') | chrome/test/chromedriver/server/http_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698