Convert importer messges to new format.

chrome/browser/importer/importer_messages.h

Index: chrome/browser/importer/importer_messages.h
===================================================================
--- chrome/browser/importer/importer_messages.h	(revision 78053)
+++ chrome/browser/importer/importer_messages.h	(working copy)
@@ -2,22 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
-#define CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
-#pragma once
-
+// Multiply-included message file, no traditonal include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/values.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/profile_writer.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/common_param_traits.h"
 #include "content/common/common_param_traits.h"
+#include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
+#include "webkit/glue/password_form.h"
 
+#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
+#define CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
+
 namespace IPC {
 
 // Traits for importer::ProfileInfo struct to pack/unpack.
@@ -362,6 +365,73 @@
 
 }  // namespace IPC
 
-#include "chrome/browser/importer/importer_messages_internal.h"
+#endif  // CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
 
-#endif  // CHROME_BROWSER_IMPORTER_IMPORTER_MESSAGES_H_
+#define IPC_MESSAGE_START ProfileImportMsgStart
+
+//-----------------------------------------------------------------------------
+// ProfileImportProcess messages
+// These are messages sent from the browser to the profile import process.
+IPC_MESSAGE_CONTROL4(ProfileImportProcessMsg_StartImport,
+                     importer::ProfileInfo /* ProfileInfo struct */,
+                     int  /* bitmask of items to import */,
+                     DictionaryValue  /* localized strings */,
+                     bool  /* import to bookmark bar */)
+
+IPC_MESSAGE_CONTROL0(ProfileImportProcessMsg_CancelImport)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessMsg_ReportImportItemFinished,
+                     int  /* ImportItem */)
+
+//---------------------------------------------------------------------------
+// ProfileImportProcessHost messages
+// These are messages sent from the profile import process to the browser.
+// These messages send information about the status of the import and
+// individual import tasks.
+IPC_MESSAGE_CONTROL0(ProfileImportProcessHostMsg_Import_Started)
+
+IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_Import_Finished,
+                     bool  /* was import successful? */,
+                     std::string  /* error message, if any */)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_ImportItem_Started,
+                     int  /* ImportItem */)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_ImportItem_Finished,
+                     int  /* ImportItem */)
+
+// These messages send data from the external importer process back to
+// the process host so it can be written to the profile.
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyHistoryImportStart,
+                     int  /* total number of history::URLRow items */)
+
+IPC_MESSAGE_CONTROL2(ProfileImportProcessHostMsg_NotifyHistoryImportGroup,
+                     std::vector<history::URLRow>,
+                     int  /* the source of URLs as in history::VisitSource.*/
+                          /* To simplify IPC call, pass as an integer */)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyHomePageImportReady,
+                     GURL  /* GURL of home page */)
+
+IPC_MESSAGE_CONTROL3(ProfileImportProcessHostMsg_NotifyBookmarksImportStart,
+                     std::wstring  /* first folder name */,
+                     int  /* options */,
+                     int  /* total number of bookmarks */)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyBookmarksImportGroup,
+                     std::vector<ProfileWriter::BookmarkEntry>)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFavIconsImportStart,
+                     int  /* total number of FavIcons */)
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyFavIconsImportGroup,
+                     std::vector<history::ImportedFavIconUsage> )
+
+IPC_MESSAGE_CONTROL1(ProfileImportProcessHostMsg_NotifyPasswordFormReady,
+                     webkit_glue::PasswordForm )
+
+IPC_MESSAGE_CONTROL3(ProfileImportProcessHostMsg_NotifyKeywordsReady,
+                     std::vector<TemplateURL>,
+                     int,  /* default keyword index */
+                     bool  /* unique on host and path */)
+