diff options
Diffstat (limited to 'chrome/browser/sessions')
5 files changed, 11 insertions, 10 deletions
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 9f4d05a..6925d91 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); } diff --git a/chrome/browser/sessions/compress_data_helper.cc b/chrome/browser/sessions/compress_data_helper.cc index 987af6a..d879fe6 100644 --- a/chrome/browser/sessions/compress_data_helper.cc +++ b/chrome/browser/sessions/compress_data_helper.cc @@ -83,7 +83,7 @@ void CompressDataHelper::CompressAndWriteStringToPickle(const std::string& str, // static bool CompressDataHelper::ReadAndDecompressStringFromPickle(const Pickle& pickle, - void** iter, + PickleIterator* iter, std::string* str) { // Read the size of the original data. int original_size = 0; diff --git a/chrome/browser/sessions/compress_data_helper.h b/chrome/browser/sessions/compress_data_helper.h index d7cbbaa..768fc5e 100644 --- a/chrome/browser/sessions/compress_data_helper.h +++ b/chrome/browser/sessions/compress_data_helper.h @@ -11,6 +11,7 @@ #include <string> class Pickle; +class PickleIterator; class CompressDataHelper { public: @@ -25,7 +26,7 @@ class CompressDataHelper { // indicates the position of the data. The same iterator is used by // Pickle::Read* functions. static bool ReadAndDecompressStringFromPickle(const Pickle& pickle, - void** iter, + PickleIterator* iter, std::string* str); private: DISALLOW_IMPLICIT_CONSTRUCTORS(CompressDataHelper); diff --git a/chrome/browser/sessions/compress_data_helper_unittest.cc b/chrome/browser/sessions/compress_data_helper_unittest.cc index 3e1da3f..f993bc5 100644 --- a/chrome/browser/sessions/compress_data_helper_unittest.cc +++ b/chrome/browser/sessions/compress_data_helper_unittest.cc @@ -23,7 +23,7 @@ TEST_F(CompressDataHelperTest, CompressAndDecompressData) { EXPECT_GT(bytes_written, 0); EXPECT_LT(bytes_written, max_bytes + 1); - void* it = NULL; + PickleIterator it(pickle); std::string data_out; ASSERT_TRUE(CompressDataHelper::ReadAndDecompressStringFromPickle( @@ -45,7 +45,7 @@ TEST_F(CompressDataHelperTest, CompressAndDecompressEmptyData) { EXPECT_EQ(0, bytes_written); - void* it = NULL; + PickleIterator it(pickle); std::string data_out; ASSERT_TRUE(CompressDataHelper::ReadAndDecompressStringFromPickle( pickle, &it, &data_out)); @@ -65,7 +65,7 @@ TEST_F(CompressDataHelperTest, TooMuchData) { EXPECT_EQ(0, bytes_written); // When the data is read, we get an empty string back. - void* it = NULL; + PickleIterator it(pickle); std::string data_out; ASSERT_TRUE(CompressDataHelper::ReadAndDecompressStringFromPickle( pickle, &it, &data_out)); diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index 2ba33b5..dcd56f0 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -1304,8 +1304,8 @@ bool SessionService::ReplacePendingCommand(SessionCommand* command) { // well. if (command->id() != kCommandUpdateTabNavigation) return false; - void* iterator = NULL; scoped_ptr<Pickle> command_pickle(command->PayloadAsPickle()); + PickleIterator iterator(*command_pickle); SessionID::id_type command_tab_id; int command_nav_index; if (!command_pickle->ReadInt(&iterator, &command_tab_id) || @@ -1323,7 +1323,7 @@ bool SessionService::ReplacePendingCommand(SessionCommand* command) { // 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 = NULL; + iterator = PickleIterator(*existing_pickle); if (!existing_pickle->ReadInt(&iterator, &existing_tab_id) || !existing_pickle->ReadInt(&iterator, &existing_nav_index)) { return false; |