Revert "Refactor automation messages." due to mysterious problems on mac.

chrome/test/automation/extension_proxy.h

 // 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.
 
 #ifndef CHROME_TEST_AUTOMATION_EXTENSION_PROXY_H_
 #define CHROME_TEST_AUTOMATION_EXTENSION_PROXY_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/common/automation_constants.h"
+#include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class AutomationMessageSender;
 class BrowserProxy;
 
 // This class presents the interface to actions that can be performed on
 // a given extension. This refers to a particular version of that extension.
 // For example, it refers to Google Translate 1.0. If the extension is
 // updated to a newer version, this proxy is invalidated.
 class ExtensionProxy : public AutomationResourceProxy {
@@ skipping 56 matching lines @@
   void EnsureBrowserActionIndexMatches(int expected_index);
 
  private:
   // Gets the string value of the property of type |type|. Returns true on
   // success.
   bool GetProperty(AutomationMsg_ExtensionProperty type, std::string* value)
       WARN_UNUSED_RESULT;
 };
 
 #endif  // CHROME_TEST_AUTOMATION_EXTENSION_PROXY_H_