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

Side by Side Diff: net/http/http_network_transaction_unittest.cc

Issue 2817043: Reduce the copying of string data between C++ and javascript in proxy_resolver_v8.cc. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix comment typo 'converts' Created 10 years, 5 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 | « no previous file | net/proxy/init_proxy_resolver.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "net/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 5214 matching lines...) Expand 10 before | Expand all | Expand 10 after
5225 } 5225 }
5226 5226
5227 virtual void CancelRequest(RequestHandle request) { 5227 virtual void CancelRequest(RequestHandle request) {
5228 NOTREACHED(); 5228 NOTREACHED();
5229 } 5229 }
5230 5230
5231 const std::vector<GURL>& resolved() const { return resolved_; } 5231 const std::vector<GURL>& resolved() const { return resolved_; }
5232 5232
5233 private: 5233 private:
5234 virtual int SetPacScript(const GURL& /*pac_url*/, 5234 virtual int SetPacScript(const GURL& /*pac_url*/,
5235 const std::string& /*pac_bytes*/, 5235 const string16& /*pac_script*/,
5236 CompletionCallback* /*callback*/) { 5236 CompletionCallback* /*callback*/) {
5237 return OK; 5237 return OK;
5238 } 5238 }
5239 5239
5240 std::vector<GURL> resolved_; 5240 std::vector<GURL> resolved_;
5241 5241
5242 DISALLOW_COPY_AND_ASSIGN(CapturingProxyResolver); 5242 DISALLOW_COPY_AND_ASSIGN(CapturingProxyResolver);
5243 }; 5243 };
5244 5244
5245 TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { 5245 TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) {
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
6139 scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session)); 6139 scoped_ptr<HttpNetworkTransaction> trans(new HttpNetworkTransaction(session));
6140 6140
6141 int rv = trans->Start(&request, &callback, BoundNetLog()); 6141 int rv = trans->Start(&request, &callback, BoundNetLog());
6142 EXPECT_EQ(ERR_IO_PENDING, rv); 6142 EXPECT_EQ(ERR_IO_PENDING, rv);
6143 EXPECT_EQ(ERR_CONNECTION_CLOSED, callback.WaitForResult()); 6143 EXPECT_EQ(ERR_CONNECTION_CLOSED, callback.WaitForResult());
6144 6144
6145 HttpNetworkTransaction::SetNextProtos(""); 6145 HttpNetworkTransaction::SetNextProtos("");
6146 HttpNetworkTransaction::SetUseAlternateProtocols(false); 6146 HttpNetworkTransaction::SetUseAlternateProtocols(false);
6147 } 6147 }
6148 } // namespace net 6148 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/proxy/init_proxy_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698