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

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_test.cc

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 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 | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/ui/webui/gpu_internals_ui.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // This test uses the safebrowsing test server published at 5 // This test uses the safebrowsing test server published at
6 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing 6 // http://code.google.com/p/google-safe-browsing/ to test the safebrowsing
7 // protocol implemetation. Details of the safebrowsing testing flow is 7 // protocol implemetation. Details of the safebrowsing testing flow is
8 // documented at 8 // documented at
9 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting 9 // http://code.google.com/p/google-safe-browsing/wiki/ProtocolTesting
10 // 10 //
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 cmd_line.AppendArg(base::StringPrintf("--port=%d", kPort_)); 144 cmd_line.AppendArg(base::StringPrintf("--port=%d", kPort_));
145 cmd_line.AppendArgNative(FILE_PATH_LITERAL("--datafile=") + 145 cmd_line.AppendArgNative(FILE_PATH_LITERAL("--datafile=") +
146 datafile.value()); 146 datafile.value());
147 147
148 base::LaunchOptions options; 148 base::LaunchOptions options;
149 #if defined(OS_WIN) 149 #if defined(OS_WIN)
150 options.start_hidden = true; 150 options.start_hidden = true;
151 #endif 151 #endif
152 if (!base::LaunchProcess(cmd_line, options, &server_handle_)) { 152 if (!base::LaunchProcess(cmd_line, options, &server_handle_)) {
153 LOG(ERROR) << "Failed to launch server: " 153 LOG(ERROR) << "Failed to launch server: "
154 << cmd_line.command_line_string(); 154 << cmd_line.GetCommandLineString();
155 return false; 155 return false;
156 } 156 }
157 return true; 157 return true;
158 } 158 }
159 159
160 // Stop the python server test suite. 160 // Stop the python server test suite.
161 bool Stop() { 161 bool Stop() {
162 if (server_handle_ == base::kNullProcessHandle) 162 if (server_handle_ == base::kNullProcessHandle)
163 return true; 163 return true;
164 164
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 } 636 }
637 637
638 // Verifies with server if test is done and waits till server responses. 638 // Verifies with server if test is done and waits till server responses.
639 EXPECT_EQ(net::URLRequestStatus::SUCCESS, 639 EXPECT_EQ(net::URLRequestStatus::SUCCESS,
640 safe_browsing_helper->VerifyTestComplete(server_host, 640 safe_browsing_helper->VerifyTestComplete(server_host,
641 server_port, 641 server_port,
642 last_step)); 642 last_step));
643 EXPECT_EQ("yes", safe_browsing_helper->response_data()); 643 EXPECT_EQ("yes", safe_browsing_helper->response_data());
644 test_server.Stop(); 644 test_server.Stop();
645 } 645 }
OLDNEW
« no previous file with comments | « chrome/browser/jumplist_win.cc ('k') | chrome/browser/ui/webui/gpu_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698