Simple cleanup to avoid needing to worry about having a reference to a deleted string.

chrome/browser/extensions/extension_service.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 "chrome/browser/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 609 matching lines @@
   } else {
     // Otherwise, the extension is unpacked (location LOAD).
     // We should always be able to remember the extension's path. If it's not in
     // the map, someone failed to update |unloaded_extension_paths_|.
     CHECK(!path.empty());
     extensions::UnpackedInstaller::Create(this)->Load(path);
   }
 }
 
 bool ExtensionService::UninstallExtension(
-    const std::string& extension_id_unsafe,
+    std::string extension_id,
     bool external_uninstall,
     std::string* error) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // Copy the extension identifier since the reference might have been
-  // obtained via Extension::id() and the extension may be deleted in
-  // this function.
-  std::string extension_id(extension_id_unsafe);
-
   scoped_refptr<const Extension> extension(GetInstalledExtension(extension_id));
 
   // Callers should not send us nonexistent extensions.
   CHECK(extension);
 
   // Policy change which triggers an uninstall will always set
   // |external_uninstall| to true so this is the only way to uninstall
   // managed extensions.
   if (!Extension::UserMayDisable(extension->location()) &&
       !external_uninstall) {
@@ skipping 1840 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }