commit c963c714c99f34bd80b392d9896ca9cecd66fb6d
author dcheng <dcheng@chromium.org> Fri Apr 08 03:55:22 2016
committer Commit bot <commit-bot@chromium.org> Fri Apr 08 03:56:38 2016
tree 86d63349159f8a16d3de5b7881aad6b3ffa9bff3
parent 70024238824031e03c1b6ace610403e6b7db0e0d

Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

BUG=554298

Review URL: https://codereview.chromium.org/1871713002

Cr-Commit-Position: refs/heads/master@{#385980}

chrome/browser/extensions/menu_manager.h

diff --git a/chrome/browser/extensions/menu_manager.h b/chrome/browser/extensions/menu_manager.h
index 0e9bf8f..cc9f171 100644
--- a/chrome/browser/extensions/menu_manager.h
+++ b/chrome/browser/extensions/menu_manager.h
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -16,7 +17,6 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
@@ -144,8 +144,8 @@
       value_ |= context;
     }
 
-    scoped_ptr<base::Value> ToValue() const {
-      return scoped_ptr<base::Value>(
+    std::unique_ptr<base::Value> ToValue() const {
+      return std::unique_ptr<base::Value>(
           new base::FundamentalValue(static_cast<int>(value_)));
     }
 
@@ -211,7 +211,7 @@
   bool SetChecked(bool checked);
 
   // Converts to Value for serialization to preferences.
-  scoped_ptr<base::DictionaryValue> ToValue() const;
+  std::unique_ptr<base::DictionaryValue> ToValue() const;
 
   // Returns a new MenuItem created from |value|, or NULL if there is
   // an error. The caller takes ownership of the MenuItem.
@@ -262,7 +262,7 @@
 
   // If this item is a child of another item, the unique id of its parent. If
   // this is a top-level item with no parent, this will be NULL.
-  scoped_ptr<Id> parent_id_;
+  std::unique_ptr<Id> parent_id_;
 
   // Patterns for restricting what documents this item will appear for. This
   // applies to the frame where the click took place.
@@ -369,7 +369,7 @@
   // Reads menu items for the extension from the state storage. Any invalid
   // items are ignored.
   void ReadFromStorage(const std::string& extension_id,
-                       scoped_ptr<base::Value> value);
+                       std::unique_ptr<base::Value> value);
 
   // Removes all "incognito" "split" mode context items.
   void RemoveAllIncognitoContextItems();