Merge 185412

chrome/browser/extensions/app_host_installer_win.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.
 
 // AppHostInstaller checks the presence of app_host.exe, and launches
 // the installer if missing. The check must be performed on the FILE thread.
 // The installation is also launched on the FILE thread as an asynchronous
 // process. Once installation completes, QuickEnableWatcher is notified.
 // AppHostInstaller::FinishOnCallerThread() is called in the end,
 // which notifies the caller via a completion callback on the original
@@ skipping 52 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(QuickEnableDelegate);
 };
 
 QuickEnableDelegate::QuickEnableDelegate(
     const OnAppHostInstallationCompleteCallback& callback)
     : callback_(callback) {}
 
 QuickEnableDelegate::~QuickEnableDelegate() {}
 
 void QuickEnableDelegate::OnObjectSignaled(HANDLE object) {
+  // Reset callback_ to free up references. But do it now because it's possible
+  // that callback_.Run() will cause this object to be deleted.
+  OnAppHostInstallationCompleteCallback callback(callback_);
+  callback_.Reset();
+
   int exit_code = 0;
   base::TerminationStatus status(
       base::GetTerminationStatus(object, &exit_code));
   if (status == base::TERMINATION_STATUS_NORMAL_TERMINATION) {
-    callback_.Run(true);
+    callback.Run(true);
   } else {
     LOG(ERROR) << "App Launcher install failed, status = " << status
                << ", exit code = " << exit_code;
-    callback_.Run(false);
+    callback.Run(false);
   }
-  callback_.Reset();
+
+  // At this point 'this' may be deleted. Don't do anything else here.
 }
 
 // Reads the path to app_host.exe from the value "UninstallString" within the
 // App Host's "ClientState" registry key.  Returns an empty string if the path
 // does not exist or cannot be read.
 string16 GetQuickEnableAppHostCommand(bool system_level) {
   HKEY root_key = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   string16 subkey(kGoogleRegClientsKey);
   subkey.append(1, L'\\').append(kBinariesAppGuid)
       .append(1, L'\\').append(kRegCommandsKey)
@@ skipping 116 matching lines @@
       delete this;
     }
     return;
   }
 
   completion_callback_.Run(success);
   delete this;
 }
 
 }  // namespace extensions