Do not call ContentMainDelegate::ProcessExiting if BasicStartupComplete return true.

content/app/content_main_runner.cc

 // Copyright (c) 2012 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 "content/public/app/content_main_runner.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/trace_event.h"
@@ skipping 273 matching lines @@
     return delegate->RunProcess(process_type, main_function_params);
 
   NOTREACHED() << "Unknown process type: " << process_type;
   return 1;
 }
 
 class ContentMainRunnerImpl : public content::ContentMainRunner {
  public:
   ContentMainRunnerImpl()
       : is_initialized_(false),
-        is_shutdown_(false) {
+        is_shutdown_(false),
+        completed_basic_startup_(false) {
   }
 
   ~ContentMainRunnerImpl() {
     if (is_initialized_ && !is_shutdown_)
       Shutdown();
   }
 
 #if defined(OS_WIN)
   virtual int Initialize(HINSTANCE instance,
                          sandbox::SandboxInterfaceInfo* sandbox_info,
@@ skipping 59 matching lines @@
     // its main event loop to get rid of the cruft.
     autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool());
 #endif
 
     CommandLine::Init(argc, argv);
 
     int exit_code;
     if (delegate && delegate->BasicStartupComplete(&exit_code))
       return exit_code;
 
+    completed_basic_startup_ = true;
+
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     std::string process_type =
           command_line.GetSwitchValueASCII(switches::kProcessType);
 
     // Enable startup tracing asap to avoid early TRACE_EVENT calls being
     // ignored.
     if (command_line.HasSwitch(switches::kTraceStartup)) {
       base::debug::TraceLog::GetInstance()->SetEnabled(
           command_line.GetSwitchValueASCII(switches::kTraceStartup));
     }
@@ skipping 109 matching lines @@
 #elif defined(OS_MACOSX)
     main_params.autorelease_pool = autorelease_pool_.get();
 #endif
 
     return RunNamedProcessTypeMain(process_type, main_params, delegate_);
   }
 
   virtual void Shutdown() OVERRIDE {
     DCHECK(is_initialized_);
     DCHECK(!is_shutdown_);
-    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    std::string process_type =
+
+    if (completed_basic_startup_ && delegate_) {
+      const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+      std::string process_type =
           command_line.GetSwitchValueASCII(switches::kProcessType);
 
-    if (delegate_)
       delegate_->ProcessExiting(process_type);
+    }
 
 #if defined(OS_WIN)
 #ifdef _CRTDBG_MAP_ALLOC
     _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
     _Module.Term();
 #endif  // OS_WIN
 
 #if defined(OS_MACOSX)
     autorelease_pool_.reset(NULL);
 #endif
 
     exit_manager_.reset(NULL);
 
     delegate_ = NULL;
     is_shutdown_ = true;
   }
 
  protected:
   // True if the runner has been initialized.
   bool is_initialized_;
 
   // True if the runner has been shut down.
   bool is_shutdown_;
 
+  // True if basic startup was completed.
+  bool completed_basic_startup_;
+
   // The delegate will outlive this object.
   content::ContentMainDelegate* delegate_;
 
   scoped_ptr<base::AtExitManager> exit_manager_;
 #if defined(OS_WIN)
   sandbox::SandboxInterfaceInfo sandbox_info_;
 #elif defined(OS_MACOSX)
   scoped_ptr<base::mac::ScopedNSAutoreleasePool> autorelease_pool_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 }  // namespace
 
 namespace content {
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content