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

chrome/browser/automation/testing_automation_provider.cc

 // 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.
 
 #include "chrome/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 1229 matching lines @@
 
 void TestingAutomationProvider::AutocompleteEditGetMatches(
     int autocomplete_edit_handle,
     bool* success,
     std::vector<AutocompleteMatchData>* matches) {
   *success = false;
   if (automation_omnibox_tracker_->ContainsHandle(autocomplete_edit_handle)) {
     const AutocompleteResult& result = automation_omnibox_tracker_->
         GetResource(autocomplete_edit_handle)->model()->result();
     for (AutocompleteResult::const_iterator i = result.begin();
-        i != result.end(); ++i)
-      matches->push_back(AutocompleteMatchData(*i));
+         i != result.end(); ++i) {
+      AutocompleteMatch match(*i);
+      AutocompleteMatchData match_data;
+      match_data.provider_name = match.provider->name();
+      match_data.relevance = match.relevance;
+      match_data.deletable = match.deletable;
+      match_data.fill_into_edit = match.fill_into_edit;
+      match_data.inline_autocomplete_offset = match.inline_autocomplete_offset;
+      match_data.destination_url = match.destination_url;
+      match_data.contents = match.contents;
+      match_data.description = match.description;
+      match_data.is_history_what_you_typed_match =
+          match.is_history_what_you_typed_match;
+      match_data.type = AutocompleteMatch::TypeToString(match.type);
+      match_data.starred = match.starred;
+      matches->push_back(match_data);
+    }
     *success = true;
   }
 }
 
 // Waits for the autocomplete edit to receive focus
 void  TestingAutomationProvider::WaitForAutocompleteEditFocus(
     int autocomplete_edit_handle,
     IPC::Message* reply_message) {
   if (!automation_omnibox_tracker_->ContainsHandle(autocomplete_edit_handle)) {
     AutomationMsg_WaitForAutocompleteEditFocus::WriteReplyParams(
@@ skipping 4703 matching lines @@
   IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }