Part 2 of reapplying r64637.

chrome/test/automation/autocomplete_edit_proxy.cc

 // Copyright (c) 2006-2009 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/test/automation/autocomplete_edit_proxy.h"
 
 #include <vector>
 
-#include "chrome/test/automation/automation_constants.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 bool AutocompleteEditProxy::GetText(std::wstring* text) const {
   if (!is_valid())
     return false;
   if (!text) {
     NOTREACHED();
@@ skipping 56 matching lines @@
     return false;
   if (!matches) {
     NOTREACHED();
     return false;
   }
   bool edit_exists = false;
   sender_->Send(new AutomationMsg_AutocompleteEditGetMatches(
       0, handle_, &edit_exists, matches));
   return edit_exists;
 }