diff options
Diffstat (limited to 'chrome')
15 files changed, 103 insertions, 91 deletions
diff --git a/chrome/browser/android/tab_state.cc b/chrome/browser/android/tab_state.cc index 5e01566..f22255a 100644 --- a/chrome/browser/android/tab_state.cc +++ b/chrome/browser/android/tab_state.cc @@ -33,8 +33,10 @@ using content::WebContents; namespace { -bool WriteStateHeaderToPickle(bool off_the_record, int entry_count, - int current_entry_index, Pickle* pickle) { +bool WriteStateHeaderToPickle(bool off_the_record, + int entry_count, + int current_entry_index, + base::Pickle* pickle) { return pickle->WriteBool(off_the_record) && pickle->WriteInt(entry_count) && pickle->WriteInt(current_entry_index); @@ -66,10 +68,9 @@ bool WriteStateHeaderToPickle(bool off_the_record, int entry_count, void UpgradeNavigationFromV0ToV2( std::vector<sessions::SerializedNavigationEntry>* navigations, int entry_count, - PickleIterator* iterator) { - + base::PickleIterator* iterator) { for (int i = 0; i < entry_count; ++i) { - Pickle v2_pickle; + base::Pickle v2_pickle; std::string virtual_url_spec; std::string str_referrer; base::string16 title; @@ -104,7 +105,7 @@ void UpgradeNavigationFromV0ToV2( // search_terms v2_pickle.WriteString16(base::string16()); - PickleIterator tab_navigation_pickle_iterator(v2_pickle); + base::PickleIterator tab_navigation_pickle_iterator(v2_pickle); sessions::SerializedNavigationEntry nav; if (nav.ReadFromPickle(&tab_navigation_pickle_iterator)) { navigations->push_back(nav); @@ -152,9 +153,9 @@ void UpgradeNavigationFromV0ToV2( void UpgradeNavigationFromV1ToV2( std::vector<sessions::SerializedNavigationEntry>* navigations, int entry_count, - PickleIterator* iterator) { + base::PickleIterator* iterator) { for (int i = 0; i < entry_count; ++i) { - Pickle v2_pickle; + base::Pickle v2_pickle; int index; std::string virtual_url_spec; @@ -203,7 +204,7 @@ void UpgradeNavigationFromV1ToV2( // Force output of search_terms v2_pickle.WriteString16(base::string16()); - PickleIterator tab_navigation_pickle_iterator(v2_pickle); + base::PickleIterator tab_navigation_pickle_iterator(v2_pickle); sessions::SerializedNavigationEntry nav; if (nav.ReadFromPickle(&tab_navigation_pickle_iterator)) { navigations->push_back(nav); @@ -224,8 +225,8 @@ bool ExtractNavigationEntries( int* current_entry_index, std::vector<sessions::SerializedNavigationEntry>* navigations) { int entry_count; - Pickle pickle(static_cast<char*>(data), size); - PickleIterator iter(pickle); + base::Pickle pickle(static_cast<char*>(data), size); + base::PickleIterator iter(pickle); if (!iter.ReadBool(is_off_the_record) || !iter.ReadInt(&entry_count) || !iter.ReadInt(current_entry_index)) { LOG(ERROR) << "Failed to restore state from byte array (length=" << size @@ -258,9 +259,10 @@ bool ExtractNavigationEntries( << ")."; return false; // It's dangerous to keep deserializing now, give up. } - Pickle tab_navigation_pickle(tab_navigation_data, - tab_navigation_data_length); - PickleIterator tab_navigation_pickle_iterator(tab_navigation_pickle); + base::Pickle tab_navigation_pickle(tab_navigation_data, + tab_navigation_data_length); + base::PickleIterator tab_navigation_pickle_iterator( + tab_navigation_pickle); sessions::SerializedNavigationEntry nav; if (!nav.ReadFromPickle(&tab_navigation_pickle_iterator)) return false; // If we failed to read a navigation, give up on others. @@ -321,7 +323,7 @@ ScopedJavaLocalRef<jobject> WebContentsState::WriteNavigationsAsByteBuffer( bool is_off_the_record, const std::vector<content::NavigationEntry*>& navigations, int current_entry) { - Pickle pickle; + base::Pickle pickle; if (!WriteStateHeaderToPickle(is_off_the_record, navigations.size(), current_entry, &pickle)) { LOG(ERROR) << "Failed to serialize tab state (entry count=" << @@ -333,7 +335,7 @@ ScopedJavaLocalRef<jobject> WebContentsState::WriteNavigationsAsByteBuffer( for (size_t i = 0; i < navigations.size(); ++i) { // Write each SerializedNavigationEntry as a separate pickle to avoid // optional reads of one tab bleeding into the next tab's data. - Pickle tab_navigation_pickle; + base::Pickle tab_navigation_pickle; // Max size taken from BaseSessionService::CreateUpdateTabNavigationCommand. static const size_t max_state_size = std::numeric_limits<sessions::SessionCommand::size_type>::max() - 1024; diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc index f4d2092..ae7acdb 100644 --- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc +++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc @@ -82,7 +82,7 @@ class QuerySelectorHandler : public content::WebContentsObserver { // There may be several requests in flight; check this response matches. int message_request_id = 0; - PickleIterator iter(message); + base::PickleIterator iter(message); if (!iter.ReadInt(&message_request_id)) return false; diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.cc b/chrome/browser/extensions/api/page_capture/page_capture_api.cc index 68c81f6..e0f6b3d 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.cc +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.cc @@ -73,7 +73,7 @@ bool PageCaptureSaveAsMHTMLFunction::OnMessageReceived( return false; int message_request_id; - PickleIterator iter(message); + base::PickleIterator iter(message); if (!iter.ReadInt(&message_request_id)) { NOTREACHED() << "malformed extension message"; return true; diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc index f1c1c54..312633d 100644 --- a/chrome/browser/extensions/extension_action.cc +++ b/chrome/browser/extensions/extension_action.cc @@ -157,7 +157,7 @@ bool ExtensionAction::ParseIconFromCanvasDictionary( } else { continue; } - PickleIterator iter(pickle); + base::PickleIterator iter(pickle); SkBitmap bitmap; if (!IPC::ReadParam(&pickle, &iter, &bitmap)) return false; diff --git a/chrome/browser/media/webrtc_log_uploader.cc b/chrome/browser/media/webrtc_log_uploader.cc index b7e96e6..c72f817 100644 --- a/chrome/browser/media/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc_log_uploader.cc @@ -246,8 +246,8 @@ void WebRtcLogUploader::UploadStoredLog( .AddExtension(FILE_PATH_LITERAL(".meta")); if (base::ReadFileToString(meta_path, &meta_data_contents) && !meta_data_contents.empty()) { - Pickle pickle(&meta_data_contents[0], meta_data_contents.size()); - PickleIterator it(pickle); + base::Pickle pickle(&meta_data_contents[0], meta_data_contents.size()); + base::PickleIterator it(pickle); std::string key, value; while (it.ReadString(&key) && it.ReadString(&value)) (*meta_data.get())[key] = value; @@ -296,7 +296,7 @@ void WebRtcLogUploader::LoggingStoppedDoStore( } if (meta_data.get() && !meta_data->empty()) { - Pickle pickle; + base::Pickle pickle; for (const auto& it : *meta_data.get()) { pickle.WriteString(it.first); pickle.WriteString(it.second); diff --git a/chrome/browser/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index 85ac9c7..12536ed 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -67,8 +67,8 @@ bool CompareForms(const autofill::PasswordForm& a, bool CheckSerializedValue(const uint8_t* byte_array, size_t length, const std::string& realm) { - const Pickle::Header* header = - reinterpret_cast<const Pickle::Header*>(byte_array); + const base::Pickle::Header* header = + reinterpret_cast<const base::Pickle::Header*>(byte_array); if (length < sizeof(*header) || header->payload_size > length - sizeof(*header)) { LOG(WARNING) << "Invalid KWallet entry detected (realm: " << realm << ")"; @@ -79,7 +79,7 @@ bool CheckSerializedValue(const uint8_t* byte_array, // Convenience function to read a GURL from a Pickle. Assumes the URL has // been written as a UTF-8 string. Returns true on success. -bool ReadGURL(PickleIterator* iter, bool warn_only, GURL* url) { +bool ReadGURL(base::PickleIterator* iter, bool warn_only, GURL* url) { std::string url_string; if (!iter->ReadString(&url_string)) { if (!warn_only) @@ -113,12 +113,12 @@ void LogDeserializationWarning(int version, // as either size when reading old pickles that fail to deserialize using the // native size. Returns true on success. bool DeserializeValueSize(const std::string& signon_realm, - const PickleIterator& init_iter, + const base::PickleIterator& init_iter, int version, bool size_32, bool warn_only, ScopedVector<autofill::PasswordForm>* forms) { - PickleIterator iter = init_iter; + base::PickleIterator iter = init_iter; size_t count = 0; if (size_32) { @@ -235,7 +235,7 @@ bool DeserializeValueSize(const std::string& signon_realm, // Serializes a list of PasswordForms to be stored in the wallet. void SerializeValue(const std::vector<autofill::PasswordForm*>& forms, - Pickle* pickle) { + base::Pickle* pickle) { pickle->WriteInt(kPickleVersion); pickle->WriteSizeT(forms.size()); for (autofill::PasswordForm* form : forms) { @@ -637,7 +637,7 @@ bool NativeBackendKWallet::GetLoginsList( } // Can't we all just agree on whether bytes are signed or not? Please? - Pickle pickle(reinterpret_cast<const char*>(bytes), length); + base::Pickle pickle(reinterpret_cast<const char*>(bytes), length); *forms = DeserializeValue(signon_realm, pickle); } @@ -719,7 +719,7 @@ bool NativeBackendKWallet::GetAllLogins( continue; // Can't we all just agree on whether bytes are signed or not? Please? - Pickle pickle(reinterpret_cast<const char*>(bytes), length); + base::Pickle pickle(reinterpret_cast<const char*>(bytes), length); AppendSecondToFirst(forms, DeserializeValue(signon_realm, pickle)); } return true; @@ -756,7 +756,7 @@ bool NativeBackendKWallet::SetLoginsList( return ret == 0; } - Pickle value; + base::Pickle value; SerializeValue(forms, &value); dbus::MethodCall method_call(kKWalletInterface, "writeEntry"); @@ -856,7 +856,7 @@ bool NativeBackendKWallet::RemoveLoginsBetween( continue; // Can't we all just agree on whether bytes are signed or not? Please? - Pickle pickle(reinterpret_cast<const char*>(bytes), length); + base::Pickle pickle(reinterpret_cast<const char*>(bytes), length); ScopedVector<autofill::PasswordForm> all_forms = DeserializeValue(signon_realm, pickle); @@ -888,8 +888,8 @@ bool NativeBackendKWallet::RemoveLoginsBetween( // static ScopedVector<autofill::PasswordForm> NativeBackendKWallet::DeserializeValue( const std::string& signon_realm, - const Pickle& pickle) { - PickleIterator iter(pickle); + const base::Pickle& pickle) { + base::PickleIterator iter(pickle); int version = -1; if (!iter.ReadInt(&version) || diff --git a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc index 297a765..9c3a37c 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x_unittest.cc @@ -605,7 +605,8 @@ void NativeBackendKWalletTest::CheckPasswordForms( EXPECT_EQ(sorted_expected[i].first, entries[i]); TestKWallet::Blob value; EXPECT_TRUE(wallet_.readEntry(folder, entries[i], &value)); - Pickle pickle(reinterpret_cast<const char*>(value.data()), value.size()); + base::Pickle pickle(reinterpret_cast<const char*>(value.data()), + value.size()); ScopedVector<autofill::PasswordForm> forms = NativeBackendKWalletStub::DeserializeValue(entries[i], pickle); const std::vector<const PasswordForm*>& expect = sorted_expected[i].second; @@ -930,14 +931,14 @@ TEST_F(NativeBackendKWalletTest, RemoveLoginsSyncedBetween) { class NativeBackendKWalletPickleTest : public NativeBackendKWalletTestBase { protected: - void CreateVersion6Pickle(const PasswordForm& form, Pickle* pickle); - void CreateVersion5Pickle(const PasswordForm& form, Pickle* pickle); - void CreateVersion3Pickle(const PasswordForm& form, Pickle* pickle); - void CreateVersion2Pickle(const PasswordForm& form, Pickle* pickle); - void CreateVersion1Pickle(const PasswordForm& form, Pickle* pickle); + void CreateVersion6Pickle(const PasswordForm& form, base::Pickle* pickle); + void CreateVersion5Pickle(const PasswordForm& form, base::Pickle* pickle); + void CreateVersion3Pickle(const PasswordForm& form, base::Pickle* pickle); + void CreateVersion2Pickle(const PasswordForm& form, base::Pickle* pickle); + void CreateVersion1Pickle(const PasswordForm& form, base::Pickle* pickle); void CreateVersion0Pickle(bool size_32, const PasswordForm& form, - Pickle* pickle); + base::Pickle* pickle); void CheckVersion6Pickle(); void CheckVersion5Pickle(); void CheckVersion3Pickle(); @@ -953,12 +954,12 @@ class NativeBackendKWalletPickleTest : public NativeBackendKWalletTestBase { void CreatePickle(bool size_32, bool date_created_internal, const PasswordForm& form, - Pickle* pickle); + base::Pickle* pickle); }; void NativeBackendKWalletPickleTest::CreateVersion6Pickle( const PasswordForm& form, - Pickle* pickle) { + base::Pickle* pickle) { pickle->WriteInt(6); CreatePickle(false, true, form, pickle); pickle->WriteInt(form.type); @@ -974,7 +975,7 @@ void NativeBackendKWalletPickleTest::CreateVersion6Pickle( void NativeBackendKWalletPickleTest::CreateVersion5Pickle( const PasswordForm& form, - Pickle* pickle) { + base::Pickle* pickle) { pickle->WriteInt(5); CreatePickle(false, true, form, pickle); pickle->WriteInt(form.type); @@ -988,7 +989,8 @@ void NativeBackendKWalletPickleTest::CreateVersion5Pickle( } void NativeBackendKWalletPickleTest::CreateVersion3Pickle( - const PasswordForm& form, Pickle* pickle) { + const PasswordForm& form, + base::Pickle* pickle) { pickle->WriteInt(3); CreatePickle(false, false, form, pickle); pickle->WriteInt(form.type); @@ -998,7 +1000,8 @@ void NativeBackendKWalletPickleTest::CreateVersion3Pickle( } void NativeBackendKWalletPickleTest::CreateVersion2Pickle( - const PasswordForm& form, Pickle* pickle) { + const PasswordForm& form, + base::Pickle* pickle) { pickle->WriteInt(2); CreatePickle(false, false, form, pickle); pickle->WriteInt(form.type); @@ -1007,13 +1010,16 @@ void NativeBackendKWalletPickleTest::CreateVersion2Pickle( } void NativeBackendKWalletPickleTest::CreateVersion1Pickle( - const PasswordForm& form, Pickle* pickle) { + const PasswordForm& form, + base::Pickle* pickle) { pickle->WriteInt(1); CreatePickle(false, false, form, pickle); } void NativeBackendKWalletPickleTest::CreateVersion0Pickle( - bool size_32, const PasswordForm& form, Pickle* pickle) { + bool size_32, + const PasswordForm& form, + base::Pickle* pickle) { pickle->WriteInt(0); CreatePickle(size_32, false, form, pickle); } @@ -1021,7 +1027,7 @@ void NativeBackendKWalletPickleTest::CreateVersion0Pickle( void NativeBackendKWalletPickleTest::CreatePickle(bool size_32, bool date_created_internal, const PasswordForm& form, - Pickle* pickle) { + base::Pickle* pickle) { if (size_32) pickle->WriteUInt32(1); // Size of form list. 32 bits. else @@ -1044,7 +1050,7 @@ void NativeBackendKWalletPickleTest::CreatePickle(bool size_32, } void NativeBackendKWalletPickleTest::CheckVersion6Pickle() { - Pickle pickle; + base::Pickle pickle; PasswordForm form = form_google_; form.generation_upload_status = PasswordForm::NEGATIVE_SIGNAL_SENT; CreateVersion6Pickle(form, &pickle); @@ -1059,7 +1065,7 @@ void NativeBackendKWalletPickleTest::CheckVersion6Pickle() { } void NativeBackendKWalletPickleTest::CheckVersion5Pickle() { - Pickle pickle; + base::Pickle pickle; PasswordForm form = form_google_; CreateVersion5Pickle(form, &pickle); @@ -1072,7 +1078,7 @@ void NativeBackendKWalletPickleTest::CheckVersion5Pickle() { } void NativeBackendKWalletPickleTest::CheckVersion3Pickle() { - Pickle pickle; + base::Pickle pickle; PasswordForm form = form_google_; // Remove the fields which were not present in version #3. form.display_name.clear(); @@ -1090,7 +1096,7 @@ void NativeBackendKWalletPickleTest::CheckVersion3Pickle() { } void NativeBackendKWalletPickleTest::CheckVersion2Pickle() { - Pickle pickle; + base::Pickle pickle; PasswordForm form = old_form_google_; form.times_used = form_google_.times_used; form.type = form_google_.type; @@ -1107,7 +1113,7 @@ void NativeBackendKWalletPickleTest::CheckVersion2Pickle() { // Make sure that we can still read version 1 pickles. void NativeBackendKWalletPickleTest::CheckVersion1Pickle() { - Pickle pickle; + base::Pickle pickle; PasswordForm form = form_google_; CreateVersion1Pickle(form, &pickle); @@ -1123,7 +1129,7 @@ void NativeBackendKWalletPickleTest::CheckVersion1Pickle() { void NativeBackendKWalletPickleTest::CheckVersion0Pickle( bool size_32, PasswordForm::Scheme scheme) { - Pickle pickle; + base::Pickle pickle; PasswordForm form = old_form_google_; form.scheme = scheme; CreateVersion0Pickle(size_32, form, &pickle); diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc index 4499b21..fdc054f 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc @@ -46,7 +46,8 @@ ui::ClipboardType ConvertClipboardType(uint32_t type) { // assume all data that is placed on the clipboard is UTF16 and pepper allows // arbitrary data so this change would require some reworking of the chrome // clipboard interface for custom data. -bool JumpToFormatInPickle(const base::string16& format, PickleIterator* iter) { +bool JumpToFormatInPickle(const base::string16& format, + base::PickleIterator* iter) { size_t size = 0; if (!iter->ReadSizeT(&size)) return false; @@ -66,22 +67,22 @@ bool JumpToFormatInPickle(const base::string16& format, PickleIterator* iter) { } bool IsFormatAvailableInPickle(const base::string16& format, - const Pickle& pickle) { - PickleIterator iter(pickle); + const base::Pickle& pickle) { + base::PickleIterator iter(pickle); return JumpToFormatInPickle(format, &iter); } std::string ReadDataFromPickle(const base::string16& format, - const Pickle& pickle) { + const base::Pickle& pickle) { std::string result; - PickleIterator iter(pickle); + base::PickleIterator iter(pickle); if (!JumpToFormatInPickle(format, &iter) || !iter.ReadString(&result)) return std::string(); return result; } bool WriteDataToPickle(const std::map<base::string16, std::string>& data, - Pickle* pickle) { + base::Pickle* pickle) { pickle->WriteSizeT(data.size()); for (std::map<base::string16, std::string>::const_iterator it = data.begin(); it != data.end(); @@ -187,7 +188,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgIsFormatAvailable( std::string clipboard_data; clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(), &clipboard_data); - Pickle pickle(clipboard_data.data(), clipboard_data.size()); + base::Pickle pickle(clipboard_data.data(), clipboard_data.size()); available = IsFormatAvailableInPickle(base::UTF8ToUTF16(format_name), pickle); } @@ -265,7 +266,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgReadData( std::string clipboard_data; clipboard->ReadData(ui::Clipboard::GetPepperCustomDataFormatType(), &clipboard_data); - Pickle pickle(clipboard_data.data(), clipboard_data.size()); + base::Pickle pickle(clipboard_data.data(), clipboard_data.size()); if (IsFormatAvailableInPickle(format_name, pickle)) { result = PP_OK; clipboard_string = ReadDataFromPickle(format_name, pickle); @@ -340,7 +341,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData( } if (custom_data_map.size() > 0) { - Pickle pickle; + base::Pickle pickle; if (WriteDataToPickle(custom_data_map, &pickle)) { scw.WritePickledData(pickle, ui::Clipboard::GetPepperCustomDataFormatType()); diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc index 82110dc..83f4513 100644 --- a/chrome/browser/safe_browsing/malware_details_unittest.cc +++ b/chrome/browser/safe_browsing/malware_details_unittest.cc @@ -72,7 +72,7 @@ void WriteHeaders(disk_cache::Entry* entry, const std::string& headers) { responseinfo.socket_address = net::HostPortPair("1.2.3.4", 80); responseinfo.headers = new net::HttpResponseHeaders(raw_headers); - Pickle pickle; + base::Pickle pickle; responseinfo.Persist(&pickle, false, false); scoped_refptr<net::WrappedIOBuffer> buf(new net::WrappedIOBuffer( diff --git a/chrome/browser/ui/app_list/fast_show_pickler.cc b/chrome/browser/ui/app_list/fast_show_pickler.cc index 8221926..a9d0835 100644 --- a/chrome/browser/ui/app_list/fast_show_pickler.cc +++ b/chrome/browser/ui/app_list/fast_show_pickler.cc @@ -75,7 +75,7 @@ bool ColorTypeToFormat(SkColorType colorType, ImageFormat* out) { return true; } -bool PickleImage(Pickle* pickle, const gfx::ImageSkia& image) { +bool PickleImage(base::Pickle* pickle, const gfx::ImageSkia& image) { std::vector<gfx::ImageSkiaRep> reps(image.image_reps()); pickle->WriteInt(static_cast<int>(reps.size())); for (std::vector<gfx::ImageSkiaRep>::const_iterator it = reps.begin(); @@ -96,7 +96,7 @@ bool PickleImage(Pickle* pickle, const gfx::ImageSkia& image) { return true; } -bool UnpickleImage(PickleIterator* it, gfx::ImageSkia* out) { +bool UnpickleImage(base::PickleIterator* it, gfx::ImageSkia* out) { int rep_count = 0; if (!it->ReadInt(&rep_count)) return false; @@ -147,7 +147,7 @@ bool UnpickleImage(PickleIterator* it, gfx::ImageSkia* out) { } // namespace scoped_ptr<AppListItem> FastShowPickler::UnpickleAppListItem( - PickleIterator* it) { + base::PickleIterator* it) { std::string id; if (!it->ReadString(&id)) return scoped_ptr<AppListItem>(); @@ -169,7 +169,8 @@ scoped_ptr<AppListItem> FastShowPickler::UnpickleAppListItem( return result.Pass(); } -bool FastShowPickler::PickleAppListItem(Pickle* pickle, AppListItem* item) { +bool FastShowPickler::PickleAppListItem(base::Pickle* pickle, + AppListItem* item) { if (!pickle->WriteString(item->id())) return false; if (!pickle->WriteString(item->name())) @@ -194,17 +195,17 @@ void FastShowPickler::CopyOverItem(AppListItem* src_item, // whenever this format is changed so new clients can invalidate old versions. const int FastShowPickler::kVersion = 3; -scoped_ptr<Pickle> FastShowPickler::PickleAppListModelForFastShow( +scoped_ptr<base::Pickle> FastShowPickler::PickleAppListModelForFastShow( AppListModel* model) { - scoped_ptr<Pickle> result(new Pickle); + scoped_ptr<base::Pickle> result(new Pickle); if (!result->WriteInt(kVersion)) - return scoped_ptr<Pickle>(); + return scoped_ptr<base::Pickle>(); if (!result->WriteInt((int)model->top_level_item_list()->item_count())) - return scoped_ptr<Pickle>(); + return scoped_ptr<base::Pickle>(); for (size_t i = 0; i < model->top_level_item_list()->item_count(); ++i) { if (!PickleAppListItem(result.get(), model->top_level_item_list()->item_at(i))) { - return scoped_ptr<Pickle>(); + return scoped_ptr<base::Pickle>(); } } return result.Pass(); @@ -220,9 +221,9 @@ void FastShowPickler::CopyOver(AppListModel* src, AppListModel* dest) { } } -scoped_ptr<AppListModel> -FastShowPickler::UnpickleAppListModelForFastShow(Pickle* pickle) { - PickleIterator it(*pickle); +scoped_ptr<AppListModel> FastShowPickler::UnpickleAppListModelForFastShow( + base::Pickle* pickle) { + base::PickleIterator it(*pickle); int read_version = 0; if (!it.ReadInt(&read_version)) return scoped_ptr<AppListModel>(); diff --git a/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc b/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc index 03a4840..678742f 100644 --- a/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc +++ b/chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc @@ -45,7 +45,7 @@ class AppListModelPicklerUnitTest : public testing::Test { } scoped_ptr<AppListModel> CopyViaPickle(AppListModel* model) { - scoped_ptr<Pickle> pickle( + scoped_ptr<base::Pickle> pickle( FastShowPickler::PickleAppListModelForFastShow(model)); return FastShowPickler::UnpickleAppListModelForFastShow(pickle.get()); } 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 ce98094..82f62c5 100644 --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc @@ -50,7 +50,7 @@ bool BrowserActionDragData::IsFromProfile(const Profile* profile) const { void BrowserActionDragData::Write( Profile* profile, ui::OSExchangeData* data) const { DCHECK(data); - Pickle data_pickle; + base::Pickle data_pickle; WriteToPickle(profile, &data_pickle); data->SetPickledData(GetBrowserActionCustomFormat(), data_pickle); } @@ -59,7 +59,7 @@ bool BrowserActionDragData::Read(const ui::OSExchangeData& data) { if (!data.HasCustomFormat(GetBrowserActionCustomFormat())) return false; - Pickle drag_data_pickle; + base::Pickle drag_data_pickle; if (!data.GetPickledData(GetBrowserActionCustomFormat(), &drag_data_pickle)) return false; @@ -81,15 +81,15 @@ BrowserActionDragData::GetBrowserActionCustomFormat() { } #endif -void BrowserActionDragData::WriteToPickle( - Profile* profile, base::Pickle* pickle) const { +void BrowserActionDragData::WriteToPickle(Profile* profile, + base::Pickle* pickle) const { pickle->WriteBytes(&profile, sizeof(profile)); pickle->WriteString(id_); pickle->WriteUInt64(index_); } -bool BrowserActionDragData::ReadFromPickle(Pickle* pickle) { - PickleIterator data_iterator(*pickle); +bool BrowserActionDragData::ReadFromPickle(base::Pickle* pickle) { + base::PickleIterator data_iterator(*pickle); const char* tmp; if (!data_iterator.ReadBytes(&tmp, sizeof(profile_))) diff --git a/chrome/common/content_settings_pattern_serializer.cc b/chrome/common/content_settings_pattern_serializer.cc index 612a96e..af36d567 100644 --- a/chrome/common/content_settings_pattern_serializer.cc +++ b/chrome/common/content_settings_pattern_serializer.cc @@ -18,7 +18,7 @@ void ContentSettingsPatternSerializer::WriteToMessage( // static bool ContentSettingsPatternSerializer::ReadFromMessage( const IPC::Message* m, - PickleIterator* iter, + base::PickleIterator* iter, ContentSettingsPattern* pattern) { DCHECK(pattern); return IPC::ReadParam(m, iter, &pattern->is_valid_) && diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc index dd81496..1573a2c 100644 --- a/chrome/common/render_messages.cc +++ b/chrome/common/render_messages.cc @@ -14,7 +14,9 @@ void ParamTraits<ContentSettingsPattern>::Write( } bool ParamTraits<ContentSettingsPattern>::Read( - const Message* m, PickleIterator* iter, ContentSettingsPattern* pattern) { + const Message* m, + base::PickleIterator* iter, + ContentSettingsPattern* pattern) { return ContentSettingsPatternSerializer::ReadFromMessage(m, iter, pattern); } diff --git a/chrome/common/safe_browsing/ipc_protobuf_message_unittest.cc b/chrome/common/safe_browsing/ipc_protobuf_message_unittest.cc index 0e9f4c9..d2fda1f 100644 --- a/chrome/common/safe_browsing/ipc_protobuf_message_unittest.cc +++ b/chrome/common/safe_browsing/ipc_protobuf_message_unittest.cc @@ -45,7 +45,7 @@ TEST_P(IPCProtobufMessageTest, FundamentalField) { IPC::WriteParam(&msg, input); TestMessage output; - PickleIterator iter(msg); + base::PickleIterator iter(msg); ASSERT_TRUE(IPC::ReadParam(&msg, &iter, &output)); if (field_is_present_) { @@ -67,7 +67,7 @@ TEST_P(IPCProtobufMessageTest, StringField) { IPC::WriteParam(&msg, input); TestMessage output; - PickleIterator iter(msg); + base::PickleIterator iter(msg); ASSERT_TRUE(IPC::ReadParam(&msg, &iter, &output)); if (field_is_present_) { @@ -89,7 +89,7 @@ TEST_P(IPCProtobufMessageTest, BytesField) { IPC::WriteParam(&msg, input); TestMessage output; - PickleIterator iter(msg); + base::PickleIterator iter(msg); ASSERT_TRUE(IPC::ReadParam(&msg, &iter, &output)); if (field_is_present_) { @@ -111,7 +111,7 @@ TEST_P(IPCProtobufMessageTest, OptionalSubmessage) { IPC::WriteParam(&msg, input); TestMessage output; - PickleIterator iter(msg); + base::PickleIterator iter(msg); ASSERT_TRUE(IPC::ReadParam(&msg, &iter, &output)); if (field_is_present_) { @@ -137,7 +137,7 @@ TEST_P(IPCProtobufMessageTest, RepeatedSubmessage) { IPC::WriteParam(&msg, input); TestMessage output; - PickleIterator iter(msg); + base::PickleIterator iter(msg); ASSERT_TRUE(IPC::ReadParam(&msg, &iter, &output)); if (field_is_present_) { |