summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/automation/url_request_automation_job.cc2
-rw-r--r--chrome/browser/bookmarks/bookmark_node_data.cc6
-rw-r--r--chrome/browser/bookmarks/bookmark_node_data.h5
-rw-r--r--chrome/browser/extensions/execute_code_in_tab_function.cc2
-rw-r--r--chrome/browser/extensions/extension_browser_actions_api.cc4
-rw-r--r--chrome/browser/extensions/extension_messages_browsertest.cc4
-rw-r--r--chrome/browser/extensions/extension_page_actions_module.cc2
-rw-r--r--chrome/browser/extensions/extension_page_capture_api.cc2
-rw-r--r--chrome/browser/extensions/extension_tabs_module.cc2
-rw-r--r--chrome/browser/importer/profile_import_process_messages.h14
-rw-r--r--chrome/browser/password_manager/native_backend_kwallet_x.cc4
-rw-r--r--chrome/browser/password_manager/native_backend_kwallet_x.h5
-rw-r--r--chrome/browser/sessions/base_session_service.cc6
-rw-r--r--chrome/browser/sessions/compress_data_helper.cc2
-rw-r--r--chrome/browser/sessions/compress_data_helper.h3
-rw-r--r--chrome/browser/sessions/compress_data_helper_unittest.cc6
-rw-r--r--chrome/browser/sessions/session_service.cc4
-rw-r--r--chrome/browser/ui/views/extensions/browser_action_drag_data.cc4
-rw-r--r--chrome/browser/visitedlink/visitedlink_unittest.cc2
19 files changed, 41 insertions, 38 deletions
diff --git a/chrome/browser/automation/url_request_automation_job.cc b/chrome/browser/automation/url_request_automation_job.cc
index c5b3d70..231a4c5 100644
--- a/chrome/browser/automation/url_request_automation_job.cc
+++ b/chrome/browser/automation/url_request_automation_job.cc
@@ -253,7 +253,7 @@ bool URLRequestAutomationJob::MayFilterMessage(const IPC::Message& message,
case AutomationMsg_RequestStarted::ID:
case AutomationMsg_RequestData::ID:
case AutomationMsg_RequestEnd::ID: {
- void* iter = NULL;
+ PickleIterator iter(message);
if (message.ReadInt(&iter, request_id))
return true;
break;
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
index 7d1d72f..14c77d3 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -55,7 +55,7 @@ void BookmarkNodeData::Element::WriteToPickle(Pickle* pickle) const {
}
bool BookmarkNodeData::Element::ReadFromPickle(Pickle* pickle,
- void** iterator) {
+ PickleIterator* iterator) {
std::string url_spec;
if (!pickle->ReadBool(iterator, &is_url) ||
!pickle->ReadString(iterator, &url_spec) ||
@@ -294,9 +294,9 @@ void BookmarkNodeData::WriteToPickle(Profile* profile, Pickle* pickle) const {
}
bool BookmarkNodeData::ReadFromPickle(Pickle* pickle) {
- void* data_iterator = NULL;
+ PickleIterator data_iterator(*pickle);
size_t element_count;
- if (profile_path_.ReadFromPickle(pickle, &data_iterator) &&
+ if (profile_path_.ReadFromPickle(&data_iterator) &&
pickle->ReadSize(&data_iterator, &element_count)) {
std::vector<Element> tmp_elements;
tmp_elements.resize(element_count);
diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h
index 748e78a..5c1f9e6 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.h
+++ b/chrome/browser/bookmarks/bookmark_node_data.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -18,6 +18,7 @@
class BookmarkNode;
class Pickle;
+class PickleIterator;
class Profile;
// BookmarkNodeData is used to represent the following:
@@ -64,7 +65,7 @@ struct BookmarkNodeData {
// For reading/writing this Element.
void WriteToPickle(Pickle* pickle) const;
- bool ReadFromPickle(Pickle* pickle, void** iterator);
+ bool ReadFromPickle(Pickle* pickle, PickleIterator* iterator);
// ID of the node.
int64 id_;
diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/execute_code_in_tab_function.cc
index 5e98a8d..d17de24 100644
--- a/chrome/browser/extensions/execute_code_in_tab_function.cc
+++ b/chrome/browser/extensions/execute_code_in_tab_function.cc
@@ -238,7 +238,7 @@ bool ExecuteCodeInTabFunction::OnMessageReceived(const IPC::Message& message) {
return false;
int message_request_id;
- void* iter = NULL;
+ PickleIterator iter(message);
if (!message.ReadInt(&iter, &message_request_id)) {
NOTREACHED() << "malformed extension message";
return true;
diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc
index 0a37658..df58bfd 100644
--- a/chrome/browser/extensions/extension_browser_actions_api.cc
+++ b/chrome/browser/extensions/extension_browser_actions_api.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -49,7 +49,7 @@ bool BrowserActionSetIconFunction::RunBrowserAction() {
base::BinaryValue* binary = NULL;
EXTENSION_FUNCTION_VALIDATE(details_->GetBinary("imageData", &binary));
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
- void* iter = NULL;
+ PickleIterator iter(bitmap_pickle);
SkBitmap bitmap;
EXTENSION_FUNCTION_VALIDATE(
IPC::ReadParam(&bitmap_pickle, &iter, &bitmap));
diff --git a/chrome/browser/extensions/extension_messages_browsertest.cc b/chrome/browser/extensions/extension_messages_browsertest.cc
index 6f9feb3..a79f021 100644
--- a/chrome/browser/extensions/extension_messages_browsertest.cc
+++ b/chrome/browser/extensions/extension_messages_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -65,7 +65,7 @@ TEST_F(ChromeRenderViewTest, ExtensionMessagesOpenChannel) {
render_thread_->sink().GetUniqueMessageMatching(
ExtensionHostMsg_OpenChannelToExtension::ID);
ASSERT_TRUE(open_channel_msg);
- void* iter = IPC::SyncMessage::GetDataIterator(open_channel_msg);
+ PickleIterator iter = IPC::SyncMessage::GetDataIterator(open_channel_msg);
ExtensionHostMsg_OpenChannelToExtension::SendParam open_params;
ASSERT_TRUE(IPC::ReadParam(open_channel_msg, &iter, &open_params));
EXPECT_EQ("testName", open_params.d);
diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc
index 1e97ad7..d154d76 100644
--- a/chrome/browser/extensions/extension_page_actions_module.cc
+++ b/chrome/browser/extensions/extension_page_actions_module.cc
@@ -161,7 +161,7 @@ bool PageActionSetIconFunction::RunImpl() {
int icon_index;
if (args->GetBinary("imageData", &binary)) {
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
- void* iter = NULL;
+ PickleIterator iter(bitmap_pickle);
scoped_ptr<SkBitmap> bitmap(new SkBitmap);
EXTENSION_FUNCTION_VALIDATE(
IPC::ReadParam(&bitmap_pickle, &iter, bitmap.get()));
diff --git a/chrome/browser/extensions/extension_page_capture_api.cc b/chrome/browser/extensions/extension_page_capture_api.cc
index 0f51bb25..3ae91d0 100644
--- a/chrome/browser/extensions/extension_page_capture_api.cc
+++ b/chrome/browser/extensions/extension_page_capture_api.cc
@@ -72,7 +72,7 @@ bool PageCaptureSaveAsMHTMLFunction::OnMessageReceivedFromRenderView(
return false;
int message_request_id;
- void* iter = NULL;
+ PickleIterator iter(message);
if (!message.ReadInt(&iter, &message_request_id)) {
NOTREACHED() << "malformed extension message";
return true;
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 1f7d530..6ab586a 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -1359,7 +1359,7 @@ bool UpdateTabFunction::OnMessageReceived(const IPC::Message& message) {
return false;
int message_request_id = -1;
- void* iter = NULL;
+ PickleIterator iter(message);
if (!message.ReadInt(&iter, &message_request_id)) {
NOTREACHED() << "malformed extension message";
return true;
diff --git a/chrome/browser/importer/profile_import_process_messages.h b/chrome/browser/importer/profile_import_process_messages.h
index 5487cfe..293bafe 100644
--- a/chrome/browser/importer/profile_import_process_messages.h
+++ b/chrome/browser/importer/profile_import_process_messages.h
@@ -35,7 +35,7 @@ struct ParamTraits<importer::SourceProfile> {
WriteParam(m, p.app_path);
WriteParam(m, static_cast<int>(p.services_supported));
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
if (!ReadParam(m, iter, &p->importer_name))
return false;
@@ -83,7 +83,7 @@ struct ParamTraits<history::URLRow> {
WriteParam(m, p.last_visit());
WriteParam(m, p.hidden());
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
history::URLID id;
GURL url;
string16 title;
@@ -137,7 +137,7 @@ struct ParamTraits<ProfileWriter::BookmarkEntry> {
WriteParam(m, p.title);
WriteParam(m, p.creation_time);
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
return
(ReadParam(m, iter, &p->in_toolbar)) &&
(ReadParam(m, iter, &p->is_folder)) &&
@@ -172,7 +172,7 @@ struct ParamTraits<history::ImportedFaviconUsage> {
WriteParam(m, p.png_data);
WriteParam(m, p.urls);
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
return
ReadParam(m, iter, &p->favicon_url) &&
ReadParam(m, iter, &p->png_data) &&
@@ -198,7 +198,7 @@ struct ParamTraits<TemplateURLRef> {
WriteParam(m, p.index_offset());
WriteParam(m, p.page_offset());
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
std::string url;
int index_offset;
int page_offset;
@@ -224,7 +224,7 @@ struct ParamTraits<TemplateURL::ImageRef> {
WriteParam(m, p.height);
WriteParam(m, p.url);
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
std::string type;
int width;
int height;
@@ -278,7 +278,7 @@ struct ParamTraits<TemplateURL> {
WriteParam(m, p.usage_count());
WriteParam(m, p.prepopulate_id());
}
- static bool Read(const Message* m, void** iter, param_type* p) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
string16 short_name;
string16 description;
bool includes_suggestions_url;
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc
index 787ed5b..964a70c 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.cc
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc
@@ -682,7 +682,7 @@ bool NativeBackendKWallet::CheckSerializedValue(const uint8_t* byte_array,
void NativeBackendKWallet::DeserializeValue(const std::string& signon_realm,
const Pickle& pickle,
PasswordFormList* forms) {
- void* iter = NULL;
+ PickleIterator iter(pickle);
int version = -1;
if (!pickle.ReadInt(&iter, &version) || version != kPickleVersion) {
@@ -739,7 +739,7 @@ void NativeBackendKWallet::DeserializeValue(const std::string& signon_realm,
}
}
-bool NativeBackendKWallet::ReadGURL(const Pickle& pickle, void** iter,
+bool NativeBackendKWallet::ReadGURL(const Pickle& pickle, PickleIterator* iter,
GURL* url) {
std::string url_string;
if (!pickle.ReadString(iter, &url_string)) {
diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.h b/chrome/browser/password_manager/native_backend_kwallet_x.h
index 23d259b..6774a8e 100644
--- a/chrome/browser/password_manager/native_backend_kwallet_x.h
+++ b/chrome/browser/password_manager/native_backend_kwallet_x.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -15,6 +15,7 @@
#include "chrome/browser/profiles/profile.h"
class Pickle;
+class PickleIterator;
class PrefService;
namespace webkit {
@@ -129,7 +130,7 @@ class NativeBackendKWallet : public PasswordStoreX::NativeBackend {
// Convenience function to read a GURL from a Pickle. Assumes the URL has
// been written as a std::string. Returns true on success.
- static bool ReadGURL(const Pickle& pickle, void** iter, GURL* url);
+ static bool ReadGURL(const Pickle& pickle, PickleIterator* iter, GURL* url);
// In case the fields in the pickle ever change, version them so we can try to
// read old pickles. (Note: do not eat old pickles past the expiration date.)
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;
diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
index 0a5413f..5af5222 100644
--- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
+++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -71,7 +71,7 @@ void BrowserActionDragData::WriteToPickle(
}
bool BrowserActionDragData::ReadFromPickle(Pickle* pickle) {
- void* data_iterator = NULL;
+ PickleIterator data_iterator(*pickle);
const char* tmp;
if (!pickle->ReadBytes(&data_iterator, &tmp, sizeof(profile_)))
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index f0b4f7f..39af08e 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -526,7 +526,7 @@ class VisitRelayingRenderProcessHost : public MockRenderProcessHost {
Profile::FromBrowserContext(GetBrowserContext()));
if (msg->type() == ChromeViewMsg_VisitedLink_Add::ID) {
- void* iter = NULL;
+ PickleIterator iter(*msg);
std::vector<uint64> fingerprints;
CHECK(IPC::ReadParam(msg, &iter, &fingerprints));
counting_profile->CountAddEvent(fingerprints.size());
generated by cgit v1.1 at 2025-02-19 05:56:27 +0000