Part 2 of reapplying r64637.

chrome_frame/cfproxy.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_FRAME_CFPROXY_H_
 #define CHROME_FRAME_CFPROXY_H_
 #pragma once
 
 #include <windows.h>
 #include <map>  // for proxy factory
 #include <vector>
 #include <string>
 #include "base/lock.h"
 #include "base/time.h"         // for base::TimeDelta
 #include "base/file_path.h"
+#include "chrome/common/automation_constants.h"
 #include "chrome/common/page_zoom.h"
-#include "chrome/test/automation/automation_constants.h"
 
 enum FindInPageDirection { BACK = 0, FWD = 1 };
 enum FindInPageCase { IGNORE_CASE = 0, CASE_SENSITIVE = 1 };
 // Specifies the font size on a page which is requested by an automation
 // client.
 enum AutomationPageFontSize {
   SMALLEST_FONT = 8,
   SMALL_FONT = 12,
   MEDIUM_FONT = 16,
   LARGE_FONT = 24,
@@ skipping 193 matching lines @@
   void GetProxy(ChromeProxyDelegate* delegate, const ProxyParams& params);
   bool ReleaseProxy(ChromeProxyDelegate* delegate, const std::string& profile);
  protected:
   virtual ChromeProxy* CreateProxy();
   typedef std::map<std::string, ChromeProxy*> ProxyMap;
   ProxyMap proxies_;
   Lock lock_;
 };
 
 #endif  // CHROME_FRAME_CFPROXY_H_