Remove ScopedVector from NavigationController.

chrome/browser/android/tab_state.cc

 // Copyright 2014 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 "chrome/browser/android/tab_state.h"
 
 #include <jni.h>
 #include <limits>
 #include <vector>
 
@@ skipping 408 matching lines @@
   bool success = ExtractNavigationEntries(data,
                                           size,
                                           saved_state_version,
                                           &is_off_the_record,
                                           &current_entry_index,
                                           &navigations);
   if (!success)
     return NULL;
 
   Profile* profile = ProfileManager::GetActiveUserProfile();
-  ScopedVector<content::NavigationEntry> scoped_entries =
+  std::vector<scoped_ptr<content::NavigationEntry>> entries =
       sessions::ContentSerializedNavigationBuilder::ToNavigationEntries(
           navigations, profile);
 
   if (is_off_the_record)
     profile = profile->GetOffTheRecordProfile();
   WebContents::CreateParams params(profile);
   params.initially_hidden = initially_hidden;
   scoped_ptr<WebContents> web_contents(WebContents::Create(params));
   web_contents->GetController().Restore(
-      current_entry_index,
-      NavigationController::RESTORE_CURRENT_SESSION,
-      &scoped_entries);
+      current_entry_index, NavigationController::RESTORE_CURRENT_SESSION,
+      &entries);
   return web_contents.release();
 }
 
 ScopedJavaLocalRef<jobject> WebContentsState::RestoreContentsFromByteBuffer(
     JNIEnv* env,
     jclass clazz,
     jobject state,
     jint saved_state_version,
     jboolean initially_hidden) {
   void* data = env->GetDirectBufferAddress(state);
@@ skipping 120 matching lines @@
       WebContentsState::RestoreContentsFromByteBuffer(env, clazz, state,
                                                       saved_state_version, true)
           .obj()));
   if (web_contents.get())
     TabAndroid::CreateHistoricalTabFromContents(web_contents.get());
 }
 
 bool RegisterTabState(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }