Revert of Remove deprecated methods from Pickle.

components/sessions/session_service_commands.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 "components/sessions/session_service_commands.h"
 
 #include <vector>
 
 #include "base/pickle.h"
 #include "components/sessions/base_session_service_commands.h"
@@ skipping 516 matching lines @@
 
         GetTab(tab_id, tabs)->user_agent_override.swap(user_agent_override);
         break;
       }
 
       case kCommandSessionStorageAssociated: {
         scoped_ptr<Pickle> command_pickle(command->PayloadAsPickle());
         SessionID::id_type command_tab_id;
         std::string session_storage_persistent_id;
         PickleIterator iter(*command_pickle.get());
-        if (!iter.ReadInt(&command_tab_id) ||
-            !iter.ReadString(&session_storage_persistent_id))
+        if (!command_pickle->ReadInt(&iter, &command_tab_id) ||
+            !command_pickle->ReadString(&iter, &session_storage_persistent_id))
           return true;
         // Associate the session storage back.
         GetTab(command_tab_id, tabs)->session_storage_persistent_id =
             session_storage_persistent_id;
         break;
       }
 
       case kCommandSetActiveWindow: {
         ActiveWindowPayload payload;
         if (!command->GetPayload(&payload, sizeof(payload))) {
@@ skipping 219 matching lines @@
   for (ScopedVector<SessionCommand>::const_reverse_iterator i =
            base_session_service->pending_commands().rbegin();
        i != base_session_service->pending_commands().rend(); ++i) {
     SessionCommand* existing_command = *i;
     if ((*command)->id() == kCommandUpdateTabNavigation &&
         existing_command->id() == kCommandUpdateTabNavigation) {
       scoped_ptr<Pickle> command_pickle((*command)->PayloadAsPickle());
       PickleIterator iterator(*command_pickle);
       SessionID::id_type command_tab_id;
       int command_nav_index;
-      if (!iterator.ReadInt(&command_tab_id) ||
-          !iterator.ReadInt(&command_nav_index)) {
+      if (!command_pickle->ReadInt(&iterator, &command_tab_id) ||
+          !command_pickle->ReadInt(&iterator, &command_nav_index)) {
         return false;
       }
       SessionID::id_type existing_tab_id;
       int existing_nav_index;
       {
         // Creating a pickle like this means the Pickle references the data from
         // the command. Make sure we delete the pickle before the command, else
         // the pickle references deleted memory.
         scoped_ptr<Pickle> existing_pickle(existing_command->PayloadAsPickle());
         iterator = PickleIterator(*existing_pickle);
-        if (!iterator.ReadInt(&existing_tab_id) ||
-            !iterator.ReadInt(&existing_nav_index)) {
+        if (!existing_pickle->ReadInt(&iterator, &existing_tab_id) ||
+            !existing_pickle->ReadInt(&iterator, &existing_nav_index)) {
           return false;
         }
       }
       if (existing_tab_id == command_tab_id &&
           existing_nav_index == command_nav_index) {
         // existing_command is an update for the same tab/index pair. Replace
         // it with the new one. We need to add to the end of the list just in
         // case there is a prune command after the update command.
         base_session_service->EraseCommand(*(i.base() - 1));
         base_session_service->AppendRebuildCommand((*command).Pass());
@@ skipping 26 matching lines @@
     AddTabsToWindows(&tabs, &windows);
     SortTabsBasedOnVisualOrderAndPrune(&windows, valid_windows);
     UpdateSelectedTabIndex(valid_windows);
   }
   STLDeleteValues(&tabs);
   // Don't delete contents of windows, that is done by the caller as all
   // valid windows are added to valid_windows.
 }
 
 }  // namespace sessions