diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 15:34:21 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-10 15:34:21 +0000 |
| commit | acd3d771eb5cbc5f2b8c2f6fcbc653d04bcc35cf (patch) | |
| tree | fa6d64799cda50a1e6de2271c231f0ca667e858c | |
| parent | 0b629cb3289e91b15d7c483e4401c570236dcb90 (diff) | |
| download | chromium_src-acd3d771eb5cbc5f2b8c2f6fcbc653d04bcc35cf.zip chromium_src-acd3d771eb5cbc5f2b8c2f6fcbc653d04bcc35cf.tar.gz chromium_src-acd3d771eb5cbc5f2b8c2f6fcbc653d04bcc35cf.tar.bz2 | |
Fixed a bug in the serialization of history::URLRow.
This caused profile import to fail and crash Chromium on startup.
BUG=75526
TEST=Remove all the profile data, then start Chromium. It crashes immediately
during profile import. (only tested on mac).
Review URL: http://codereview.chromium.org/6650026
Patch from Joao da Silva <joaodasilva@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77642 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/importer/importer_messages.h | 4 | ||||
| -rw-r--r-- | ipc/ipc_message_macros.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/importer/importer_messages.h b/chrome/browser/importer/importer_messages.h index 854343a..f0ee019 100644 --- a/chrome/browser/importer/importer_messages.h +++ b/chrome/browser/importer/importer_messages.h @@ -86,15 +86,13 @@ struct ParamTraits<history::URLRow> { int visit_count, typed_count; base::Time last_visit; bool hidden; - history::FavIconID favicon_id; if (!ReadParam(m, iter, &id) || !ReadParam(m, iter, &url) || !ReadParam(m, iter, &title) || !ReadParam(m, iter, &visit_count) || !ReadParam(m, iter, &typed_count) || !ReadParam(m, iter, &last_visit) || - !ReadParam(m, iter, &hidden) || - !ReadParam(m, iter, &favicon_id)) + !ReadParam(m, iter, &hidden)) return false; *p = history::URLRow(url, id); p->set_title(title); diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index b8885dc..a41cadf 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -299,7 +299,7 @@ IPC_MESSAGE_DECL(SYNC, CONTROL, msg_class, 4, 4, (type1_in, type2_in, type3_in, type4_in), (type1_out, type2_out, type3_out, type4_out)) #define IPC_SYNC_MESSAGE_CONTROL5_0(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in) \ - IPC_MESSAGE_DECL(SYNC, CONTROL, msg_class, 5, 0, (type1_in, type2_in, type3_in, type4_in, type5_in), ())) + IPC_MESSAGE_DECL(SYNC, CONTROL, msg_class, 5, 0, (type1_in, type2_in, type3_in, type4_in, type5_in), ()) #define IPC_SYNC_MESSAGE_CONTROL5_1(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in, type1_out) \ IPC_MESSAGE_DECL(SYNC, CONTROL, msg_class, 5, 1, (type1_in, type2_in, type3_in, type4_in, type5_in), (type1_out)) @@ -389,7 +389,7 @@ IPC_MESSAGE_DECL(SYNC, ROUTED, msg_class, 4, 4, (type1_in, type2_in, type3_in, type4_in), (type1_out, type2_out, type3_out, type4_out)) #define IPC_SYNC_MESSAGE_ROUTED5_0(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in) \ - IPC_MESSAGE_DECL(SYNC, ROUTED, msg_class, 5, 1, (type1_in, type2_in, type3_in, type4_in, type5_in), ())) + IPC_MESSAGE_DECL(SYNC, ROUTED, msg_class, 5, 1, (type1_in, type2_in, type3_in, type4_in, type5_in), ()) #define IPC_SYNC_MESSAGE_ROUTED5_1(msg_class, type1_in, type2_in, type3_in, type4_in, type5_in, type1_out) \ IPC_MESSAGE_DECL(SYNC, ROUTED, msg_class, 5, 1, (type1_in, type2_in, type3_in, type4_in, type5_in), (type1_out)) |