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

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

Issue 10905087: Revert 154861 - Run safebrowsing_service_test through the net testserver code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/test/base_test_server.cc ('k') | net/test/local_test_server.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) 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/local_sync_test_server.h" 5 #include "net/test/local_sync_test_server.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "net/test/test_server.h" 10 #include "net/test/test_server.h"
(...skipping 11 matching lines...) Expand all
22 net::TestServer::kLocalhost, 22 net::TestServer::kLocalhost,
23 FilePath()), 23 FilePath()),
24 xmpp_port_(xmpp_port) { 24 xmpp_port_(xmpp_port) {
25 SetPort(port); 25 SetPort(port);
26 } 26 }
27 27
28 LocalSyncTestServer::~LocalSyncTestServer() {} 28 LocalSyncTestServer::~LocalSyncTestServer() {}
29 29
30 bool LocalSyncTestServer::AddCommandLineArguments( 30 bool LocalSyncTestServer::AddCommandLineArguments(
31 CommandLine* command_line) const { 31 CommandLine* command_line) const {
32 if (!LocalTestServer::AddCommandLineArguments(command_line)) 32 LocalTestServer::AddCommandLineArguments(command_line);
33 return false;
34 if (xmpp_port_ != 0) { 33 if (xmpp_port_ != 0) {
35 std::string xmpp_port_str = base::IntToString(xmpp_port_); 34 std::string xmpp_port_str = base::IntToString(xmpp_port_);
36 command_line->AppendArg("--xmpp-port=" + xmpp_port_str); 35 command_line->AppendArg("--xmpp-port=" + xmpp_port_str);
37 } 36 }
38 return true; 37 return true;
39 } 38 }
40 39
41 } // namespace net 40 } // namespace net
OLDNEW
« no previous file with comments | « net/test/base_test_server.cc ('k') | net/test/local_test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698