Index: content/browser/accessibility/accessibility_tree_formatter.cc |
diff --git a/content/browser/accessibility/accessibility_tree_formatter.cc b/content/browser/accessibility/accessibility_tree_formatter.cc |
index 70a00f4f5cfb60bc413ef2520028f23fdb43ec6c..0aa5bdf151f0203c5f575b27f6fb5a2682798009 100644 |
--- a/content/browser/accessibility/accessibility_tree_formatter.cc |
+++ b/content/browser/accessibility/accessibility_tree_formatter.cc |
@@ -6,8 +6,9 @@ |
#include <stddef.h> |
+#include <memory> |
+ |
#include "base/logging.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/pattern.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
@@ -34,18 +35,17 @@ AccessibilityTreeFormatter::AccessibilityTreeFormatter() |
AccessibilityTreeFormatter::~AccessibilityTreeFormatter() { |
} |
-scoped_ptr<base::DictionaryValue> |
-AccessibilityTreeFormatter::BuildAccessibilityTree( |
- BrowserAccessibility* root) { |
+std::unique_ptr<base::DictionaryValue> |
+AccessibilityTreeFormatter::BuildAccessibilityTree(BrowserAccessibility* root) { |
CHECK(root); |
- scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue); |
+ std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue); |
RecursiveBuildAccessibilityTree(*root, dict.get()); |
return dict; |
} |
void AccessibilityTreeFormatter::FormatAccessibilityTree( |
BrowserAccessibility* root, base::string16* contents) { |
- scoped_ptr<base::DictionaryValue> dict = BuildAccessibilityTree(root); |
+ std::unique_ptr<base::DictionaryValue> dict = BuildAccessibilityTree(root); |
RecursiveFormatAccessibilityTree(*(dict.get()), contents); |
} |