linked_ptr->unique_ptr in system_indicator_manager.cc/h

chrome/browser/extensions/api/system_indicator/system_indicator_manager.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/api/system_indicator/system_indicator_manager.h"
 
 #include <utility>
 
-#include "base/memory/linked_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_icon_observer.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/common/extensions/api/system_indicator.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "ui/gfx/image/image.h"
 
 namespace extensions {
 
 namespace system_indicator = api::system_indicator;
 
 // Observes clicks on a given status icon and forwards the event to the
 // appropriate extension.  Handles icon updates, and responsible for creating
 // and removing the icon from the notification area during construction and
 // destruction.
 class ExtensionIndicatorIcon : public StatusIconObserver,
                                public ExtensionActionIconFactory::Observer {
  public:
-  static ExtensionIndicatorIcon* Create(const Extension* extension,
-                                        ExtensionAction* action,
-                                        Profile* profile,
-                                        StatusTray* status_tray);
+  static std::unique_ptr<ExtensionIndicatorIcon> Create(
+      const Extension* extension,
+      ExtensionAction* action,
+      Profile* profile,
+      StatusTray* status_tray);
   ~ExtensionIndicatorIcon() override;
 
   // StatusIconObserver implementation.
   void OnStatusIconClicked() override;
 
   // ExtensionActionIconFactory::Observer implementation.
   void OnIconUpdated() override;
 
  private:
   ExtensionIndicatorIcon(const Extension* extension,
                          ExtensionAction* action,
                          Profile* profile,
                          StatusTray* status_tray);
 
   const extensions::Extension* extension_;
   StatusTray* status_tray_;
   StatusIcon* icon_;
   Profile* profile_;
   ExtensionActionIconFactory icon_factory_;
 };
 
-ExtensionIndicatorIcon* ExtensionIndicatorIcon::Create(
+std::unique_ptr<ExtensionIndicatorIcon> ExtensionIndicatorIcon::Create(
     const Extension* extension,
     ExtensionAction* action,
     Profile* profile,
     StatusTray* status_tray) {
   std::unique_ptr<ExtensionIndicatorIcon> extension_icon(
       new ExtensionIndicatorIcon(extension, action, profile, status_tray));
 
   // Check if a status icon was successfully created.
   if (extension_icon->icon_)
-    return extension_icon.release();
+    return extension_icon;
 
   // We could not create a status icon.
-  return NULL;
+  return std::unique_ptr<ExtensionIndicatorIcon>();
 }
 
 ExtensionIndicatorIcon::~ExtensionIndicatorIcon() {
   if (icon_) {
     icon_->RemoveObserver(this);
     status_tray_->RemoveStatusIcon(icon_);
   }
 }
 
 void ExtensionIndicatorIcon::OnStatusIconClicked() {
@@ skipping 93 matching lines @@
 void SystemIndicatorManager::CreateOrUpdateIndicator(
     const Extension* extension,
     ExtensionAction* extension_action) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SystemIndicatorMap::iterator it = system_indicators_.find(extension->id());
   if (it != system_indicators_.end()) {
     it->second->OnIconUpdated();
     return;
   }
 
-  ExtensionIndicatorIcon* extension_icon = ExtensionIndicatorIcon::Create(
-      extension, extension_action, profile_, status_tray_);
+  std::unique_ptr<ExtensionIndicatorIcon> extension_icon =
+      ExtensionIndicatorIcon::Create(extension, extension_action, profile_,
+                                     status_tray_);
   if (extension_icon)
-    system_indicators_[extension->id()] = make_linked_ptr(extension_icon);
+    system_indicators_[extension->id()] = std::move(extension_icon);
 }
 
 void SystemIndicatorManager::RemoveIndicator(const std::string& extension_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   system_indicators_.erase(extension_id);
 }
 
 }  // namespace extensions