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

Side by Side Diff: net/test/test_server.cc

Issue 9668028: [Sync] Create new top-level sync/ directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync to head Created 8 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 | « net/net.gyp ('k') | sync/OWNERS » ('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 "net/test/test_server.h" 5 #include "net/test/test_server.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 308
309 // Locate the Python code generated by the protocol buffers compiler. 309 // Locate the Python code generated by the protocol buffers compiler.
310 FilePath pyproto_dir; 310 FilePath pyproto_dir;
311 if (!GetPyProtoPath(&pyproto_dir)) { 311 if (!GetPyProtoPath(&pyproto_dir)) {
312 LOG(WARNING) << "Cannot find pyproto dir for generated code. " 312 LOG(WARNING) << "Cannot find pyproto dir for generated code. "
313 << "Testserver features that rely on it will not work"; 313 << "Testserver features that rely on it will not work";
314 return true; 314 return true;
315 } 315 }
316 316
317 AppendToPythonPath(pyproto_dir); 317 AppendToPythonPath(pyproto_dir);
318 AppendToPythonPath(pyproto_dir.AppendASCII("chrome") 318 AppendToPythonPath(pyproto_dir.AppendASCII("sync").AppendASCII("protocol"));
319 .AppendASCII("browser")
320 .AppendASCII("sync")
321 .AppendASCII("protocol"));
322 AppendToPythonPath(pyproto_dir.AppendASCII("chrome") 319 AppendToPythonPath(pyproto_dir.AppendASCII("chrome")
323 .AppendASCII("browser") 320 .AppendASCII("browser")
324 .AppendASCII("policy") 321 .AppendASCII("policy")
325 .AppendASCII("proto")); 322 .AppendASCII("proto"));
326 323
327 return true; 324 return true;
328 } 325 }
329 326
330 bool TestServer::ParseServerData(const std::string& server_data) { 327 bool TestServer::ParseServerData(const std::string& server_data) {
331 VLOG(1) << "Server data: " << server_data; 328 VLOG(1) << "Server data: " << server_data;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 command_line->AppendArg(kBulkCipherSwitch + "=3des"); 418 command_line->AppendArg(kBulkCipherSwitch + "=3des");
422 419
423 if (https_options_.record_resume) 420 if (https_options_.record_resume)
424 command_line->AppendArg("--https-record-resume"); 421 command_line->AppendArg("--https-record-resume");
425 } 422 }
426 423
427 return true; 424 return true;
428 } 425 }
429 426
430 } // namespace net 427 } // namespace net
OLDNEW
« no previous file with comments | « net/net.gyp ('k') | sync/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698