Move AutoFill messages into a separate file.

chrome/browser/autofill/autofill_manager_unittest.cc

 // Copyright (c) 2010 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.
 
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/tuple.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/common/render_messages.h"
+#include "chrome/common/autofill_messages.h"

[Ilya Sherman, 2011/01/26 04:43:12]

nit: header order

 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 
 using webkit_glue::FormData;
@@ skipping 434 matching lines @@
                             const webkit_glue::FormField& field,
                             int unique_id) {
     autofill_manager_->OnFillAutoFillFormData(query_id, form, field, unique_id);
   }
 
   bool GetAutoFillSuggestionsMessage(int* page_id,
                                      std::vector<string16>* values,
                                      std::vector<string16>* labels,
                                      std::vector<string16>* icons,
                                      std::vector<int>* unique_ids) {
-    const uint32 kMsgID = ViewMsg_AutoFillSuggestionsReturned::ID;
+    const uint32 kMsgID = AutoFillMsg_SuggestionsReturned::ID;
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
 
     AutoFillParam autofill_param;
-    ViewMsg_AutoFillSuggestionsReturned::Read(message, &autofill_param);
+    AutoFillMsg_SuggestionsReturned::Read(message, &autofill_param);
     if (page_id)
       *page_id = autofill_param.a;
     if (values)
       *values = autofill_param.b;
     if (labels)
       *labels = autofill_param.c;
     if (icons)
       *icons = autofill_param.d;
     if (unique_ids)
       *unique_ids = autofill_param.e;
 
     autofill_manager_->tab_contents()->autocomplete_history_manager()->
         CancelPendingQuery();
     process()->sink().ClearMessages();
     return true;
   }
 
   bool GetAutoFillFormDataFilledMessage(int *page_id, FormData* results) {
-    const uint32 kMsgID = ViewMsg_AutoFillFormDataFilled::ID;
+    const uint32 kMsgID = AutoFillMsg_FormDataFilled::ID;
     const IPC::Message* message =
         process()->sink().GetFirstMessageMatching(kMsgID);
     if (!message)
       return false;
     Tuple2<int, FormData> autofill_param;
-    ViewMsg_AutoFillFormDataFilled::Read(message, &autofill_param);
+    AutoFillMsg_FormDataFilled::Read(message, &autofill_param);
     if (page_id)
       *page_id = autofill_param.a;
     if (results)
       *results = autofill_param.b;
 
     process()->sink().ClearMessages();
     return true;
   }
 
  protected:
@@ skipping 1054 matching lines @@
 #else
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
   profile()->GetPrefs()->SetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled, true);
   profile()->GetPrefs()->ClearPref(prefs::kAutoFillAuxiliaryProfilesEnabled);
   ASSERT_FALSE(profile()->GetPrefs()->GetBoolean(
       prefs::kAutoFillAuxiliaryProfilesEnabled));
 #endif
 }