[Extensions] Fix lifetime bug in ExtensionAction/IconImage

chrome/browser/extensions/extension_browsertest.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 "chrome/browser/extensions/extension_browsertest.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 208 matching lines @@
       }
 
       EXPECT_EQ(0u, extension->install_warnings().size())
           << install_warnings_message;
       return NULL;
     }
   }
 
   const std::string extension_id = extension->id();
 
+  // If this is an incognito test (e.g. where the test fixture appended the
+  // --incognito flag), we need to use the original profile when we wait for
+  // notifications.
+  Profile* original_profile = profile()->GetOriginalProfile();
+
   if (!install_param.empty()) {
-    extensions::ExtensionPrefs::Get(profile())
+    extensions::ExtensionPrefs::Get(original_profile)
         ->SetInstallParam(extension_id, install_param);
     // Re-enable the extension if needed.
     if (registry->enabled_extensions().Contains(extension_id)) {
       content::WindowedNotificationObserver load_signal(
           extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-          content::Source<Profile>(profile()));
+          content::Source<Profile>(original_profile));
       // Reload the extension so that the
       // NOTIFICATION_EXTENSION_LOADED_DEPRECATED
       // observers may access |install_param|.
       service->ReloadExtension(extension_id);
       load_signal.Wait();
       extension = service->GetExtensionById(extension_id, false);
       CHECK(extension) << extension_id << " not found after reloading.";
     }
   }
 
   // Toggling incognito or file access will reload the extension, so wait for
   // the reload and grab the new extension instance. The default state is
   // incognito disabled and file access enabled, so we don't wait in those
   // cases.
   {
     content::WindowedNotificationObserver load_signal(
         extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-        content::Source<Profile>(profile()));
-    CHECK(!extensions::util::IsIncognitoEnabled(extension_id, profile()))
+        content::Source<Profile>(original_profile));
+    CHECK(!extensions::util::IsIncognitoEnabled(extension_id, original_profile))
         << extension_id << " is enabled in incognito, but shouldn't be";
 
     if (flags & kFlagEnableIncognito) {
-      extensions::util::SetIsIncognitoEnabled(extension_id, profile(), true);
+      extensions::util::SetIsIncognitoEnabled(extension_id, original_profile,
+                                              true);
       load_signal.Wait();
       extension = service->GetExtensionById(extension_id, false);
       CHECK(extension) << extension_id << " not found after reloading.";
     }
   }
 
   {
     content::WindowedNotificationObserver load_signal(
         extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-        content::Source<Profile>(profile()));
-    CHECK(extensions::util::AllowFileAccess(extension_id, profile()));
+        content::Source<Profile>(original_profile));
+    CHECK(extensions::util::AllowFileAccess(extension_id, original_profile));
     if (!(flags & kFlagEnableFileAccess)) {
-      extensions::util::SetAllowFileAccess(extension_id, profile(), false);
+      extensions::util::SetAllowFileAccess(extension_id, original_profile,
+                                           false);
       load_signal.Wait();
       extension = service->GetExtensionById(extension_id, false);
       CHECK(extension) << extension_id << " not found after reloading.";
     }
   }
 
   if (!observer_->WaitForExtensionViewsToLoad())
     return NULL;
 
   return extension;
@@ skipping 355 matching lines @@
   return extensions::browsertest_util::ExecuteScriptInBackgroundPage(
       profile(), extension_id, script);
 }
 
 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait(
     const std::string& extension_id,
     const std::string& script) {
   return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait(
       profile(), extension_id, script);
 }