Reverting this CL to see if this fixes chrome frame unit test failures....

chrome_frame/chrome_frame_automation.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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_CHROME_FRAME_AUTOMATION_H_
 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <string>
 #include <map>
@@ skipping 69 matching lines @@
 
 // This structure contains information used for launching chrome.
 struct ChromeFrameLaunchParams {
   int automation_server_launch_timeout;
   GURL url;
   GURL referrer;
   std::wstring profile_name;
   std::wstring extra_chrome_arguments;
   bool perform_version_check;
   bool incognito_mode;
-  FilePath profile_path;
 };
 
 // We must create and destroy automation proxy in a thread with a message loop.
 // Hence thread cannot be a member of the proxy.
 class ProxyFactory {
  public:
   // Callback when chrome process launch is complete and automation handshake
   // (Hello message) is established.
   struct DECLSPEC_NOVTABLE LaunchDelegate {
     virtual void LaunchComplete(ChromeFrameAutomationProxy* proxy,
@@ skipping 52 matching lines @@
       public TabProxy::TabProxyDelegate,
       public ProxyFactory::LaunchDelegate {
  public:
   ChromeFrameAutomationClient();
   ~ChromeFrameAutomationClient();
 
   // Called from UI thread.
   virtual bool Initialize(ChromeFrameDelegate* chrome_frame_delegate,
                           int automation_server_launch_timeout,
                           bool perform_version_check,
-                          const FilePath& profile_path,
+                          const std::wstring& profile_name,
                           const std::wstring& extra_chrome_arguments,
                           bool incognito);
   void Uninitialize();
 
   virtual bool InitiateNavigation(const std::string& url,
                                   const std::string& referrer,
                                   bool is_privileged);
   virtual bool NavigateToIndex(int index);
   bool ForwardMessageFromExternalHost(const std::string& message,
                                       const std::string& origin,
@@ skipping 81 matching lines @@
   // is reused.
   bool Reinitialize(ChromeFrameDelegate* chrome_frame_delegate,
                     PluginUrlRequestManager* url_fetcher);
 
   // Attaches an existing external tab to this automation client instance.
   void AttachExternalTab(uint64 external_tab_cookie);
   void BlockExternalTab(uint64 cookie);
 
   void SetPageFontSize(enum AutomationPageFontSize);
 
-  // For IDeleteBrowsingHistorySupport
-  void RemoveBrowsingData(int remove_mask);
-
   ChromeFrameAutomationProxy* automation_server() {
     return automation_server_;
   }
 
  protected:
   // ChromeFrameAutomationProxy::LaunchDelegate implementation.
   virtual void LaunchComplete(ChromeFrameAutomationProxy* proxy,
                             AutomationLaunchResult result);
   // TabProxyDelegate implementation
   virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
@@ skipping 81 matching lines @@
  public:
   void SetUrlFetcher(PluginUrlRequestManager* url_fetcher) {
     DCHECK(url_fetcher != NULL);
     url_fetcher_ = url_fetcher;
     thread_safe_url_fetcher_ = url_fetcher->IsThreadSafe();
     url_fetcher_->set_delegate(this);
   }
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_