[Extensions Cleanup] Make ActionInfo::Set*() take unique_ptrs

Rather than having ActionInfo::Set*() methods take a raw pointer, which
was released by a unique_ptr, and then is wrapped in another unique_ptr,
just have the methods take a unique_ptr directly.

Bug: None
Change-Id: I1d126e59b39f38859e4d16c63cbef8e757042a1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1562099
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#650567}

chrome/common/extensions/api/extension_action/action_info.cc

@@ -27,15 +27,15 @@ constexpr char kDisabled[] = "disabled";
 // The manifest data container for the ActionInfos for BrowserActions,
 // PageActions and SystemIndicators.
 struct ActionInfoData : public Extension::ManifestData {
-  explicit ActionInfoData(ActionInfo* action_info);
+  explicit ActionInfoData(std::unique_ptr<ActionInfo> action_info);
   ~ActionInfoData() override;
 
   // The action associated with the BrowserAction.
   std::unique_ptr<ActionInfo> action_info;
 };
 
-ActionInfoData::ActionInfoData(ActionInfo* info) : action_info(info) {
-}
+ActionInfoData::ActionInfoData(std::unique_ptr<ActionInfo> info)
+    : action_info(std::move(info)) {}
 
 ActionInfoData::~ActionInfoData() {
 }
@@ -157,28 +157,30 @@ const ActionInfo* ActionInfo::GetSystemIndicatorInfo(
 
 // static
 void ActionInfo::SetExtensionActionInfo(Extension* extension,
-                                        ActionInfo* info) {
+                                        std::unique_ptr<ActionInfo> info) {
   extension->SetManifestData(keys::kAction,
-                             std::make_unique<ActionInfoData>(info));
+                             std::make_unique<ActionInfoData>(std::move(info)));
 }
 
 // static
-void ActionInfo::SetBrowserActionInfo(Extension* extension, ActionInfo* info) {
+void ActionInfo::SetBrowserActionInfo(Extension* extension,
+                                      std::unique_ptr<ActionInfo> info) {
   extension->SetManifestData(keys::kBrowserAction,
-                             std::make_unique<ActionInfoData>(info));
+                             std::make_unique<ActionInfoData>(std::move(info)));
 }
 
 // static
-void ActionInfo::SetPageActionInfo(Extension* extension, ActionInfo* info) {
+void ActionInfo::SetPageActionInfo(Extension* extension,
+                                   std::unique_ptr<ActionInfo> info) {
   extension->SetManifestData(keys::kPageAction,
-                             std::make_unique<ActionInfoData>(info));
+                             std::make_unique<ActionInfoData>(std::move(info)));
 }
 
 // static
 void ActionInfo::SetSystemIndicatorInfo(Extension* extension,
-                                        ActionInfo* info) {
+                                        std::unique_ptr<ActionInfo> info) {
   extension->SetManifestData(keys::kSystemIndicator,
-                             std::make_unique<ActionInfoData>(info));
+                             std::make_unique<ActionInfoData>(std::move(info)));
 }
 
 // static

chrome/common/extensions/api/extension_action/action_info.h

@@ -55,18 +55,21 @@ struct ActionInfo {
   // Returns the extension's system indicator, if any.
   static const ActionInfo* GetSystemIndicatorInfo(const Extension* extension);
 
-  // Sets the extension's action. |extension| takes ownership of |info|.
-  static void SetExtensionActionInfo(Extension* extension, ActionInfo* info);
+  // Sets the extension's action.
+  static void SetExtensionActionInfo(Extension* extension,
+                                     std::unique_ptr<ActionInfo> info);
 
-  // Sets the extension's browser action. |extension| takes ownership of |info|.
-  static void SetBrowserActionInfo(Extension* extension, ActionInfo* info);
+  // Sets the extension's browser action.
+  static void SetBrowserActionInfo(Extension* extension,
+                                   std::unique_ptr<ActionInfo> info);
 
-  // Sets the extension's page action. |extension| takes ownership of |info|.
-  static void SetPageActionInfo(Extension* extension, ActionInfo* info);
+  // Sets the extension's page action.
+  static void SetPageActionInfo(Extension* extension,
+                                std::unique_ptr<ActionInfo> info);
 
-  // Sets the extension's system indicator. |extension| takes ownership of
-  // |info|.
-  static void SetSystemIndicatorInfo(Extension* extension, ActionInfo* info);
+  // Sets the extension's system indicator.
+  static void SetSystemIndicatorInfo(Extension* extension,
+                                     std::unique_ptr<ActionInfo> info);
 
   // Returns true if the extension needs a verbose install message because
   // of its page action.

chrome/common/extensions/api/system_indicator/system_indicator_handler.cc

@@ -35,7 +35,7 @@ bool SystemIndicatorHandler::Parse(Extension* extension,
   if (!action_info.get())
     return false;
 
-  ActionInfo::SetSystemIndicatorInfo(extension, action_info.release());
+  ActionInfo::SetSystemIndicatorInfo(extension, std::move(action_info));
   return true;
 }
 

chrome/common/extensions/manifest_handlers/extension_action_handler.cc

@@ -67,7 +67,7 @@ bool ExtensionActionHandler::Parse(Extension* extension,
       return false;  // Failed to parse extension action definition.
 
     if (key == manifest_keys::kAction) {
-      ActionInfo::SetExtensionActionInfo(extension, action_info.release());
+      ActionInfo::SetExtensionActionInfo(extension, std::move(action_info));
     } else {
       if (dict->HasKey(manifest_keys::kActionDefaultState)) {
         *error =
@@ -76,9 +76,9 @@ bool ExtensionActionHandler::Parse(Extension* extension,
       }
 
       if (key == manifest_keys::kPageAction)
-        ActionInfo::SetPageActionInfo(extension, action_info.release());
+        ActionInfo::SetPageActionInfo(extension, std::move(action_info));
       else
-        ActionInfo::SetBrowserActionInfo(extension, action_info.release());
+        ActionInfo::SetBrowserActionInfo(extension, std::move(action_info));
     }
   } else {  // No key, used for synthesizing an action for extensions with none.
     if (Manifest::IsComponentLocation(extension->location()))
@@ -96,7 +96,7 @@ bool ExtensionActionHandler::Parse(Extension* extension,
     // action) because the action should not be seen as enabled on every page.
     std::unique_ptr<ActionInfo> action_info(new ActionInfo());
     action_info->synthesized = true;
-    ActionInfo::SetPageActionInfo(extension, action_info.release());
+    ActionInfo::SetPageActionInfo(extension, std::move(action_info));
   }
 
   return true;