| Index: chrome/browser/sessions/base_session_service.cc
|
| diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
|
| index 9f4d05a1ce222c5d5358850c43f085edce77535f..6925d91d52645c80f497a46b0cb75242c47ac60f 100644
|
| --- a/chrome/browser/sessions/base_session_service.cc
|
| +++ b/chrome/browser/sessions/base_session_service.cc
|
| @@ -273,7 +273,7 @@ bool BaseSessionService::RestoreUpdateTabNavigationCommand(
|
| 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_)) ||
|
| @@ -328,7 +328,7 @@ bool BaseSessionService::RestoreSetTabExtensionAppIDCommand(
|
| if (!pickle.get())
|
| return false;
|
|
|
| - void* iterator = NULL;
|
| + PickleIterator iterator(*pickle);
|
| return pickle->ReadInt(&iterator, tab_id) &&
|
| pickle->ReadString(&iterator, extension_app_id);
|
| }
|
| @@ -341,7 +341,7 @@ bool BaseSessionService::RestoreSetWindowAppNameCommand(
|
| if (!pickle.get())
|
| return false;
|
|
|
| - void* iterator = NULL;
|
| + PickleIterator iterator(*pickle);
|
| return pickle->ReadInt(&iterator, window_id) &&
|
| pickle->ReadString(&iterator, app_name);
|
| }
|
|
|