Cleanup code used to diagnose and fix bug 81449.

content/browser/child_process_launcher.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 "content/browser/child_process_launcher.h"
 
 #include <utility>  // For std::pair.
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 238 matching lines @@
 #endif
             process_.handle()));
     process_.set_handle(base::kNullProcessHandle);
   }
 
   void SetProcessBackgrounded(bool background) {
     DCHECK(!starting_);
     process_.SetProcessBackgrounded(background);
   }
 
-// TODO(apatrick): Remove this ASAP. http://crbog.com/81449 shows that this is
-// called before later calling null. Disable optimization to try and get more
-// information about what happened here.
-#if defined(OS_WIN)
-#pragma optimize("", off)
-#endif
-
   static void TerminateInternal(
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
       bool zygote,
 #endif
       base::ProcessHandle handle) {
     base::Process process(handle);
      // Client has gone away, so just kill the process.  Using exit code 0
     // means that UMA won't treat this as a crash.
     process.Terminate(content::RESULT_CODE_NORMAL_EXIT);
     // On POSIX, we must additionally reap the child.
 #if defined(OS_POSIX)
 #if !defined(OS_MACOSX)
     if (zygote) {
       // If the renderer was created via a zygote, we have to proxy the reaping
       // through the zygote process.
       ZygoteHost::GetInstance()->EnsureProcessTerminated(handle);
     } else
 #endif  // !OS_MACOSX
     {
       ProcessWatcher::EnsureProcessTerminated(handle);
     }
 #endif  // OS_POSIX
     process.Close();
   }
 
-#if defined(OS_WIN)
-#pragma optimize("", on)
-#endif
-
   Client* client_;
   BrowserThread::ID client_thread_id_;
   base::Process process_;
   base::TerminationStatus termination_status_;
   int exit_code_;
   bool starting_;
   // Controls whether the child process should be terminated on browser
   // shutdown. Default behavior is to terminate the child.
   bool terminate_child_on_shutdown_;
 
@@ skipping 81 matching lines @@
           context_.get(),
           &ChildProcessLauncher::Context::SetProcessBackgrounded,
           background));
 }
 
 void ChildProcessLauncher::SetTerminateChildOnShutdown(
   bool terminate_on_shutdown) {
   if (context_)
     context_->set_terminate_child_on_shutdown(terminate_on_shutdown);
 }