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

Unified Diff: net/socket/ssl_test_util.cc

Issue 195067: Turn NULL used as int to 0.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/directory_lister.cc ('k') | webkit/glue/webcursor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_test_util.cc
===================================================================
--- net/socket/ssl_test_util.cc (revision 28691)
+++ net/socket/ssl_test_util.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -136,7 +136,8 @@
// The issuer name of the cert that should be trusted for the test to work.
const wchar_t TestServerLauncher::kCertIssuerName[] = L"Test CA";
-TestServerLauncher::TestServerLauncher() : process_handle_(NULL),
+TestServerLauncher::TestServerLauncher() : process_handle_(
+ base::kNullProcessHandle),
forking_(false),
connection_attempts_(10),
connection_timeout_(1000)
@@ -149,7 +150,7 @@
TestServerLauncher::TestServerLauncher(int connection_attempts,
int connection_timeout)
- : process_handle_(NULL),
+ : process_handle_(base::kNullProcessHandle),
forking_(false),
connection_attempts_(connection_attempts),
connection_timeout_(connection_timeout)
@@ -331,7 +332,7 @@
bool ret = base::WaitForSingleProcess(process_handle_, timeout_ms);
if (ret) {
base::CloseProcessHandle(process_handle_);
- process_handle_ = NULL;
+ process_handle_ = base::kNullProcessHandle;
LOG(INFO) << "Finished.";
} else {
LOG(INFO) << "Timed out.";
@@ -346,7 +347,7 @@
bool ret = base::KillProcess(process_handle_, 1, true);
if (ret) {
base::CloseProcessHandle(process_handle_);
- process_handle_ = NULL;
+ process_handle_ = base::kNullProcessHandle;
LOG(INFO) << "Stopped.";
} else {
LOG(INFO) << "Kill failed?";
« no previous file with comments | « net/base/directory_lister.cc ('k') | webkit/glue/webcursor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698