Remove ScopedVector from NavigationController.

android_webview/native/state_serializer.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 "android_webview/native/state_serializer.h"
 
 #include <string>
 
-#include "base/memory/scoped_vector.h"
 #include "base/pickle.h"
 #include "base/time/time.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_state.h"
 
 // Reasons for not re-using TabNavigation under chrome/ as of 20121116:
@@ skipping 68 matching lines @@
   if (!iterator->ReadInt(&selected_entry))
     return false;
 
   if (entry_count < 0)
     return false;
   if (selected_entry < -1)
     return false;
   if (selected_entry >= entry_count)
     return false;
 
-  ScopedVector<content::NavigationEntry> restored_entries;
+  std::vector<scoped_ptr<content::NavigationEntry>> entries;

[ncarter (slow), 2015/11/12 18:10:40]

Might as well:

entries.reserve(entry_count)

?

[Avi (use Gerrit), 2015/11/12 19:13:04]

Done.

   for (int i = 0; i < entry_count; ++i) {
-    restored_entries.push_back(content::NavigationEntry::Create());
-    if (!internal::RestoreNavigationEntryFromPickle(iterator,
-                                                    restored_entries[i]))
+    entries.push_back(content::NavigationEntry::Create());
+    if (!internal::RestoreNavigationEntryFromPickle(iterator, entries[i].get()))
       return false;
 
-    restored_entries[i]->SetPageID(i);
+    entries[i]->SetPageID(i);
   }
 
   // |web_contents| takes ownership of these entries after this call.
   content::NavigationController& controller = web_contents->GetController();
   controller.Restore(
       selected_entry,
       content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY,
-      &restored_entries);
-  DCHECK_EQ(0u, restored_entries.size());
+      &entries);
+  DCHECK_EQ(0u, entries.size());
 
   if (controller.GetLastCommittedEntry()) {
     // Set up the file access rights for the selected navigation entry.
     // TODO(joth): This is duplicated from chrome/.../session_restore.cc and
     // should be shared e.g. in  NavigationController. http://crbug.com/68222
     const int id = web_contents->GetRenderProcessHost()->GetID();
     const content::PageState& page_state =
         controller.GetLastCommittedEntry()->GetPageState();
     const std::vector<base::FilePath>& file_paths =
         page_state.GetReferencedFiles();
@@ skipping 156 matching lines @@
       return false;
     entry->SetHttpStatusCode(http_status_code);
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview