Automation: fix chrome/browser dependency on chrome/test headers.

chrome/common/automation_messages.h

 // Copyright (c) 2011 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.
 
 // Multiply-included message file, no traditional include guard.
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/content_settings.h"
 #include "content/common/common_param_traits.h"
 #include "content/common/page_type.h"
 #include "content/common/security_style.h"
 #include "content/common/webkit_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/upload_data.h"
 #include "ui/gfx/rect.h"
 
 // Singly-included section, not yet converted.
 #ifndef CHROME_COMMON_AUTOMATION_MESSAGES_H__
 #define CHROME_COMMON_AUTOMATION_MESSAGES_H__
 
+struct AutocompleteMatch;
+
 struct AutomationMsg_Find_Params {
   // Unused value, which exists only for backwards compat.
   int unused;
 
   // The word(s) to find on the page.
   string16 search_string;
 
   // Whether to search forward or backward within the page.
   bool forward;
 
@@ skipping 160 matching lines @@
 
   std::string url;
   std::string method;
   std::string referrer;
   std::string extra_request_headers;
   scoped_refptr<net::UploadData> upload_data;
   int resource_type;  // see webkit/glue/resource_type.h
   int load_flags; // see net/base/load_flags.h
 };
 
+// The purpose of this class is to act as a serializable version of
+// AutocompleteMatch. The reason for this class is because we don't want to
+// serialize all elements of AutocompleteMatch and we want some data from the
+// autocomplete provider without the hassle of serializing it.
+struct AutocompleteMatchData {

[Peter Kasting, 2011/06/01 20:28:33]

Nit: This used to have a constructor.  It might be nice to still have one.

[Paweł Hajdan Jr., 2011/06/01 20:30:03]

The constructor can't be in chrome/common because it references code in
chrome/browser. chrome/common can't depend on chrome/browser. And I think the
default constructor was just not used in a meaningful way.

[Peter Kasting, 2011/06/01 21:05:52]

Then we should move AutocompleteMatch to chrome/common.  It makes no sense to
not put it there but then have a class that copies all its members; that's still
a dependency, it's just one that's easy to break.  We should just eliminate
AutocompleteMatchData and write code that can serialize an AutocompleteMatch
itself and be done with it.

It'd be even nicer to get rid of this from chrome/common entirely and have tests
depend on chrome/browser if need be, but I suspect that's impossible.

+  std::string provider_name;
+  int relevance;
+  bool deletable;
+  string16 fill_into_edit;
+  size_t inline_autocomplete_offset;
+  GURL destination_url;
+  string16 contents;
+  string16 description;
+  bool is_history_what_you_typed_match;
+  std::string type;
+  bool starred;
+};
+
 namespace IPC {
 
 template <>
 struct ParamTraits<AutomationMsg_Find_Params> {
   typedef AutomationMsg_Find_Params param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
@@ skipping 135 matching lines @@
 };
 
 template <>
 struct ParamTraits<AttachExternalTabParams> {
   typedef AttachExternalTabParams param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
+template <>
+struct ParamTraits<AutocompleteMatchData> {
+  typedef AutocompleteMatchData param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* r);
+  static void Log(const param_type& p, std::string* l);
+};
+
 }  // namespace IPC
 
 #endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__
 
 // Keep this internal message file unchanged to preserve line numbering
 // (and hence the dubious __LINE__-based message numberings) across versions.
 #include "chrome/common/automation_messages_internal.h"