Part 2 of reapplying r64637.

chrome/browser/automation/testing_automation_provider_views.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 "chrome/browser/automation/testing_automation_provider.h"
 
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/toolbar_view.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
 #include "gfx/point.h"
 #include "views/controls/menu/menu_wrapper.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // Helper class that waits until the focus has changed to a view other
 // than the one with the provided view id.
@@ skipping 164 matching lines @@
           reply_message, true);
     Send(reply_message);
     return;
   }
 
   // Otherwise, register this reply message with the waiter,
   // which will handle responding to this IPC when the popup
   // menu opens.
   popup_menu_waiter_->set_reply_message(reply_message);
 }