Part 2 of reapplying r64637.

chrome/test/automation/tab_proxy.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/test/automation/tab_proxy.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/common/automation_messages.h"
 #include "chrome/common/json_value_serializer.h"
-#include "chrome/test/automation/automation_constants.h"
-#include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "googleurl/src/gurl.h"
 
 TabProxy::TabProxy(AutomationMessageSender* sender,
                    AutomationHandleTracker* tracker,
                    int handle)
     : AutomationResourceProxy(tracker, sender, handle) {
 }
 
 
@@ skipping 805 matching lines @@
                                                       json));
 }
 
 void TabProxy::FirstObjectAdded() {
   AddRef();
 }
 
 void TabProxy::LastObjectRemoved() {
   Release();
 }