| Index: net/socket/ssl_test_util.cc
 | 
| diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc
 | 
| index e60cab98e09992c16af6b3995830cc076d879bb5..7e73f1e800189188b3b33d40b1fc3c8161397139 100644
 | 
| --- a/net/socket/ssl_test_util.cc
 | 
| +++ b/net/socket/ssl_test_util.cc
 | 
| @@ -1,4 +1,4 @@
 | 
| -// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 | 
| +// Copyright (c) 2006-2008 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,7 @@ const int TestServerLauncher::kBadHTTPSPort = 9666;
 | 
|  // 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_(0),
 | 
| +TestServerLauncher::TestServerLauncher() : process_handle_(NULL),
 | 
|                                             forking_(false),
 | 
|                                             connection_attempts_(10),
 | 
|                                             connection_timeout_(1000)
 | 
| @@ -149,7 +149,7 @@ TestServerLauncher::TestServerLauncher() : process_handle_(0),
 | 
|  
 | 
|  TestServerLauncher::TestServerLauncher(int connection_attempts,
 | 
|                                         int connection_timeout)
 | 
| -                        : process_handle_(0),
 | 
| +                        : process_handle_(NULL),
 | 
|                            forking_(false),
 | 
|                            connection_attempts_(connection_attempts),
 | 
|                            connection_timeout_(connection_timeout)
 | 
| @@ -331,7 +331,7 @@ bool TestServerLauncher::WaitToFinish(int timeout_ms) {
 | 
|    bool ret = base::WaitForSingleProcess(process_handle_, timeout_ms);
 | 
|    if (ret) {
 | 
|      base::CloseProcessHandle(process_handle_);
 | 
| -    process_handle_ = 0;
 | 
| +    process_handle_ = NULL;
 | 
|      LOG(INFO) << "Finished.";
 | 
|    } else {
 | 
|      LOG(INFO) << "Timed out.";
 | 
| @@ -346,7 +346,7 @@ bool TestServerLauncher::Stop() {
 | 
|    bool ret = base::KillProcess(process_handle_, 1, true);
 | 
|    if (ret) {
 | 
|      base::CloseProcessHandle(process_handle_);
 | 
| -    process_handle_ = 0;
 | 
| +    process_handle_ = NULL;
 | 
|      LOG(INFO) << "Stopped.";
 | 
|    } else {
 | 
|      LOG(INFO) << "Kill failed?";
 | 
| 
 |