Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/test/automation/autocomplete_edit_proxy.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H__
 #define CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H__
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
   size_t inline_autocomplete_offset;
   GURL destination_url;
   std::wstring contents;
   std::wstring description;
   bool is_history_what_you_typed_match;
   std::string type;
   bool starred;
 };
 typedef std::vector<AutocompleteMatchData> Matches;
 
+namespace IPC {
+
 template <>
 struct ParamTraits<AutocompleteMatchData> {
   typedef AutocompleteMatchData param_type;
-  static void Write(IPC::Message* m, const param_type& p) {
+  static void Write(Message* m, const param_type& p) {
     m->WriteString(p.provider_name);
     m->WriteInt(p.relevance);
     m->WriteBool(p.deletable);
     m->WriteWString(p.fill_into_edit);
     m->WriteSize(p.inline_autocomplete_offset);
     m->WriteString(p.destination_url.possibly_invalid_spec());
     m->WriteWString(p.contents);
     m->WriteWString(p.description);
     m->WriteBool(p.is_history_what_you_typed_match);
     m->WriteString(p.type);
     m->WriteBool(p.starred);
   }
 
-  static bool Read(const IPC::Message* m, void** iter, param_type* r) {
+  static bool Read(const Message* m, void** iter, param_type* r) {
     std::string destination_url;
     if (!m->ReadString(iter, &r->provider_name) ||
         !m->ReadInt(iter, &r->relevance) ||
         !m->ReadBool(iter, &r->deletable) ||
         !m->ReadWString(iter, &r->fill_into_edit) ||
         !m->ReadSize(iter, &r->inline_autocomplete_offset) ||
         !m->ReadString(iter, &destination_url) ||
         !m->ReadWString(iter, &r->contents) ||
         !m->ReadWString(iter, &r->description) ||
         !m->ReadBool(iter, &r->is_history_what_you_typed_match) ||
@@ skipping 23 matching lines @@
     l->append(p.description);
     l->append(L" ");
     l->append(p.is_history_what_you_typed_match ? L"true" : L"false");
     l->append(L" ");
     l->append(UTF8ToWide(p.type));
     l->append(L" ");
     l->append(p.starred ? L"true" : L"false");
     l->append(L"]");
   }
 };
+}  // namespace IPC
 
 class AutocompleteEditProxy : public AutomationResourceProxy {
  public:
   AutocompleteEditProxy(AutomationMessageSender* sender,
                         AutomationHandleTracker* tracker,
                         int handle)
       : AutomationResourceProxy(tracker, sender, handle) {}
   virtual ~AutocompleteEditProxy() {}
 
   // All these functions return true if the autocomplete edit is valid and
@@ skipping 19 matching lines @@
   // to finish. Returns false if IPC call failed or if the function times out.
   bool WaitForQuery(int wait_timeout_ms) const;
 
  private:
   DISALLOW_EVIL_CONSTRUCTORS(AutocompleteEditProxy);
 };
 
 #endif  // #define CHROME_TEST_AUTOMATION_AUTOCOMPLETE_EDIT_PROXY_H__