Part 2 of reapplying r64637.

chrome/test/automation/automation_handle_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/test/automation/automation_handle_tracker.h"
 
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 
 AutomationResourceProxy::AutomationResourceProxy(
     AutomationHandleTracker* tracker, AutomationMessageSender* sender,
     AutomationHandle handle)
     : handle_(handle),
       tracker_(tracker),
       sender_(sender),
       is_valid_(true) {
       tracker_->Add(this);
@@ skipping 45 matching lines @@
 AutomationResourceProxy* AutomationHandleTracker::GetResource(
     AutomationHandle handle) {
   AutoLock lock(map_lock_);
   HandleToObjectMap::iterator iter = handle_to_object_.find(handle);
   if (iter == handle_to_object_.end())
     return NULL;
 
   iter->second->AddRef();
   return iter->second;
 }