Part 2 of reapplying r64637.

chrome/browser/automation/automation_resource_tracker.cc

 // 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.
 
 #include "chrome/browser/automation/automation_resource_tracker.h"
 
+#include "chrome/common/automation_messages.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/test/automation/automation_messages.h"
 
 AutomationResourceTrackerImpl::AutomationResourceTrackerImpl(
     IPC::Message::Sender* sender)
     : sender_(sender) {
 }
 
 AutomationResourceTrackerImpl::~AutomationResourceTrackerImpl() {
 }
 
 int AutomationResourceTrackerImpl::AddImpl(const void* resource) {
@@ skipping 57 matching lines @@
 void AutomationResourceTrackerImpl::HandleCloseNotification(
     const void* resource) {
   if (!ContainsResourceImpl(resource))
     return;
 
   sender_->Send(
     new AutomationMsg_InvalidateHandle(0, resource_to_handle_[resource]));
 
   RemoveImpl(resource);
 }