Convert //android_webview to use std::unique_ptr

android_webview/native/state_serializer_unittest.cc

Index: android_webview/native/state_serializer_unittest.cc
diff --git a/android_webview/native/state_serializer_unittest.cc b/android_webview/native/state_serializer_unittest.cc
index 9415367d7f26958adda5590b6402d39569440d44..eb8a34a1216648daed73dc8388da2243ebe6e125 100644
--- a/android_webview/native/state_serializer_unittest.cc
+++ b/android_webview/native/state_serializer_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "android_webview/native/state_serializer.h"
 
+#include <memory>
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ -23,8 +23,8 @@ namespace android_webview {
 
 namespace {
 
-scoped_ptr<content::NavigationEntry> CreateNavigationEntry() {
-  scoped_ptr<content::NavigationEntry> entry(
+std::unique_ptr<content::NavigationEntry> CreateNavigationEntry() {
+  std::unique_ptr<content::NavigationEntry> entry(
       content::NavigationEntry::Create());
 
   const GURL url("http://url");
@@ -103,13 +103,14 @@ TEST(AndroidWebViewStateSerializerTest, TestNavigationEntrySerialization) {
   content::ContentBrowserClient browser_client;
   content::SetBrowserClientForTesting(&browser_client);
 
-  scoped_ptr<content::NavigationEntry> entry(CreateNavigationEntry());
+  std::unique_ptr<content::NavigationEntry> entry(CreateNavigationEntry());
 
   base::Pickle pickle;
   bool result = internal::WriteNavigationEntryToPickle(*entry, &pickle);
   EXPECT_TRUE(result);
 
-  scoped_ptr<content::NavigationEntry> copy(content::NavigationEntry::Create());
+  std::unique_ptr<content::NavigationEntry> copy(
+      content::NavigationEntry::Create());
   base::PickleIterator iterator(pickle);
   result = internal::RestoreNavigationEntryFromPickle(&iterator, copy.get());
   EXPECT_TRUE(result);
@@ -139,14 +140,15 @@ TEST(AndroidWebViewStateSerializerTest,
   content::ContentBrowserClient browser_client;
   content::SetBrowserClientForTesting(&browser_client);
 
-  scoped_ptr<content::NavigationEntry> entry(CreateNavigationEntry());
+  std::unique_ptr<content::NavigationEntry> entry(CreateNavigationEntry());
 
   base::Pickle pickle;
   bool result = internal::WriteNavigationEntryToPickle(
       internal::AW_STATE_VERSION_INITIAL, *entry, &pickle);
   EXPECT_TRUE(result);
 
-  scoped_ptr<content::NavigationEntry> copy(content::NavigationEntry::Create());
+  std::unique_ptr<content::NavigationEntry> copy(
+      content::NavigationEntry::Create());
   base::PickleIterator iterator(pickle);
   result = internal::RestoreNavigationEntryFromPickle(
       internal::AW_STATE_VERSION_INITIAL, &iterator, copy.get());
@@ -176,7 +178,7 @@ TEST(AndroidWebViewStateSerializerTest, TestEmptyDataURLSerialization) {
   content::ContentBrowserClient browser_client;
   content::SetBrowserClientForTesting(&browser_client);
 
-  scoped_ptr<content::NavigationEntry> entry(
+  std::unique_ptr<content::NavigationEntry> entry(
       content::NavigationEntry::Create());
   EXPECT_FALSE(entry->GetDataURLAsString());
 
@@ -184,7 +186,8 @@ TEST(AndroidWebViewStateSerializerTest, TestEmptyDataURLSerialization) {
   bool result = internal::WriteNavigationEntryToPickle(*entry, &pickle);
   EXPECT_TRUE(result);
 
-  scoped_ptr<content::NavigationEntry> copy(content::NavigationEntry::Create());
+  std::unique_ptr<content::NavigationEntry> copy(
+      content::NavigationEntry::Create());
   base::PickleIterator iterator(pickle);
   result = internal::RestoreNavigationEntryFromPickle(&iterator, copy.get());
   EXPECT_TRUE(result);
@@ -198,7 +201,7 @@ TEST(AndroidWebViewStateSerializerTest, TestHugeDataURLSerialization) {
   content::ContentBrowserClient browser_client;
   content::SetBrowserClientForTesting(&browser_client);
 
-  scoped_ptr<content::NavigationEntry> entry(
+  std::unique_ptr<content::NavigationEntry> entry(
       content::NavigationEntry::Create());
   string huge_data_url(1024 * 1024 * 20 - 1, 'd');
   huge_data_url.replace(0, strlen(url::kDataScheme), url::kDataScheme);
@@ -212,7 +215,8 @@ TEST(AndroidWebViewStateSerializerTest, TestHugeDataURLSerialization) {
   bool result = internal::WriteNavigationEntryToPickle(*entry, &pickle);
   EXPECT_TRUE(result);
 
-  scoped_ptr<content::NavigationEntry> copy(content::NavigationEntry::Create());
+  std::unique_ptr<content::NavigationEntry> copy(
+      content::NavigationEntry::Create());
   base::PickleIterator iterator(pickle);
   result = internal::RestoreNavigationEntryFromPickle(&iterator, copy.get());
   EXPECT_TRUE(result);