Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/browser/sessions/base_session_service.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 "chrome/browser/sessions/base_session_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
@@ skipping 255 matching lines @@
   return new SessionCommand(command_id, pickle);
 }
 
 bool BaseSessionService::RestoreUpdateTabNavigationCommand(
     const SessionCommand& command,
     TabNavigation* navigation,
     SessionID::id_type* tab_id) {
   scoped_ptr<Pickle> pickle(command.PayloadAsPickle());
   if (!pickle.get())
     return false;
-  void* iterator = NULL;
+  PickleIterator iterator(*pickle);
   std::string url_spec;
   if (!pickle->ReadInt(&iterator, tab_id) ||
       !pickle->ReadInt(&iterator, &(navigation->index_)) ||
       !pickle->ReadString(&iterator, &url_spec) ||
       !pickle->ReadString16(&iterator, &(navigation->title_)) ||
       !pickle->ReadString(&iterator, &(navigation->state_)) ||
       !pickle->ReadInt(&iterator,
                        reinterpret_cast<int*>(&(navigation->transition_))))
     return false;
   // type_mask did not always exist in the written stream. As such, we
@@ skipping 34 matching lines @@
 }
 
 bool BaseSessionService::RestoreSetTabExtensionAppIDCommand(
     const SessionCommand& command,
     SessionID::id_type* tab_id,
     std::string* extension_app_id) {
   scoped_ptr<Pickle> pickle(command.PayloadAsPickle());
   if (!pickle.get())
     return false;
 
-  void* iterator = NULL;
+  PickleIterator iterator(*pickle);
   return pickle->ReadInt(&iterator, tab_id) &&
       pickle->ReadString(&iterator, extension_app_id);
 }
 
 bool BaseSessionService::RestoreSetWindowAppNameCommand(
     const SessionCommand& command,
     SessionID::id_type* window_id,
     std::string* app_name) {
   scoped_ptr<Pickle> pickle(command.PayloadAsPickle());
   if (!pickle.get())
     return false;
 
-  void* iterator = NULL;
+  PickleIterator iterator(*pickle);
   return pickle->ReadInt(&iterator, window_id) &&
       pickle->ReadString(&iterator, app_name);
 }
 
 bool BaseSessionService::ShouldTrackEntry(const GURL& url) {
   // NOTE: Do not track print preview tab because re-opening that page will
   // just display a non-functional print preview page.
   return url.is_valid() && url != GURL(chrome::kChromeUIPrintURL);
 }
 
@@ skipping 29 matching lines @@
 
 void BaseSessionService::ResetContentStateReadingMetrics() {
   time_spent_reading_compressed_content_states = base::TimeDelta();
 }
 
 void BaseSessionService::WriteContentStateReadingMetrics() {
   UMA_HISTOGRAM_TIMES("SessionService.ReadingCompressedContentStates",
                       time_spent_reading_compressed_content_states);
   ResetContentStateReadingMetrics();
 }