Base: Don't delete the previous command line when calling

base/command_line.cc

 // Copyright (c) 2011 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.
 
 #include "base/command_line.h"
 
 #include <algorithm>
 #include <ostream>
 
 #include "base/basictypes.h"
@@ skipping 150 matching lines @@
     : argv_(1),
       begin_args_(1) {
   InitFromArgv(argv);
 }
 
 CommandLine::~CommandLine() {
 }
 
 // static
 void CommandLine::Init(int argc, const char* const* argv) {
-  delete current_process_commandline_;
+  if (current_process_commandline_) {

[msw, 2011/06/28 23:19:42]

I don't think this should fail silently. There might be some clients relying on
this behavior, even if it's incorrect. If this is the right behavior change, add
a DCHECK or a CHECK.

[rvargas (doing something else), 2011/06/28 23:57:35]

I was going to CHECK... except that it will defeat the purpose of the change,
because it happens for a build configuration. And I don't want to add code
specifically for one configuration when I'm just following the documented
behavior.

+    // If this is intentional, Reset() must be called first. If we are using
+    // the shared build mode, we have to share a single object across multiple
+    // shared libraries.
+    return;
+  }
+
   current_process_commandline_ = new CommandLine(NO_PROGRAM);
 #if defined(OS_WIN)
   current_process_commandline_->ParseFromString(::GetCommandLineW());
 #elif defined(OS_POSIX)
   current_process_commandline_->InitFromArgv(argc, argv);
 #endif
 }
 
 // static
 void CommandLine::Reset() {
@@ skipping 209 matching lines @@
   int num_args = 0;
   wchar_t** args = NULL;
   args = ::CommandLineToArgvW(command_line_string.c_str(), &num_args);
 
   PLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: " <<
                            command_line;
   InitFromArgv(num_args, args);
   LocalFree(args);
 }
 #endif