[Mac] Retain a reference within a scoped_nsobject of a Page Action's context menu.

chrome/browser/cocoa/location_bar/page_action_decoration.mm

 // Copyright (c) 2010 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 <cmath>
 
 #import "chrome/browser/cocoa/location_bar/page_action_decoration.h"
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
@@ skipping 20 matching lines @@
 PageActionDecoration::PageActionDecoration(
     LocationBarViewMac* owner,
     Profile* profile,
     ExtensionAction* page_action)
     : owner_(owner),
       profile_(profile),
       page_action_(page_action),
       tracker_(this),
       current_tab_id_(-1),
       preview_enabled_(false) {
+  DCHECK(profile);
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
       page_action->extension_id(), false);
   DCHECK(extension);
 
   // Load all the icons declared in the manifest. This is the contents of the
   // icons array, plus the default_icon property, if any.
   std::vector<std::string> icon_paths(*page_action->icon_paths());
   if (!page_action_->default_icon_path().empty())
     icon_paths.push_back(page_action_->default_icon_path());
 
   for (std::vector<std::string>::iterator iter = icon_paths.begin();
        iter != icon_paths.end(); ++iter) {
     tracker_.LoadImage(extension, extension->GetResource(*iter),
                        gfx::Size(Extension::kPageActionIconMaxSize,
                                  Extension::kPageActionIconMaxSize),
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
       Source<Profile>(profile_));
 }
 
-PageActionDecoration::~PageActionDecoration() {
-}
+PageActionDecoration::~PageActionDecoration() {}
 
 // Always |kPageActionIconMaxSize| wide.  |ImageDecoration| draws the
 // image centered.
 CGFloat PageActionDecoration::GetWidthForSpace(CGFloat width) {
   return Extension::kPageActionIconMaxSize;
 }
 
 // Either notify listeners or show a popup depending on the Page
 // Action.
 bool PageActionDecoration::OnMousePressed(NSRect frame) {
@@ skipping 137 matching lines @@
   if (!profile_)
     return nil;
   ExtensionsService* service = profile_->GetExtensionsService();
   if (!service)
     return nil;
   Extension* extension = service->GetExtensionById(
       page_action_->extension_id(), false);
   DCHECK(extension);
   if (!extension)
     return nil;
-  return [[[ExtensionActionContextMenu alloc]
-            initWithExtension:extension
-                      profile:profile_
-              extensionAction:page_action_] autorelease];
+  menu_.reset([[ExtensionActionContextMenu alloc]
+      initWithExtension:extension
+                profile:profile_
+        extensionAction:page_action_]);
+
+  return menu_.get();
 }
 
 void PageActionDecoration::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
       ExtensionPopupController* popup = [ExtensionPopupController popup];
       if (popup && ![popup isClosing])
         [popup close];
 
       break;
     }
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }