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

chrome_frame/test/automation_client_mock.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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_TEST_AUTOMATION_CLIENT_MOCK_H_
-#define CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
+#ifndef CHROME_FRAME_AUTOMATION_CLIENT_MOCK_H_
+#define CHROME_FRAME_AUTOMATION_CLIENT_MOCK_H_
 
 #include <windows.h>
 #include <string>
 
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/proxy_factory_mock.h"
 #include "gmock/gmock.h"
 
 // ChromeFrameAutomationClient [CFAC] tests.
@@ skipping 114 matching lines @@
   MockProxyFactory factory_;
   MockCFDelegate   cfd_;
   chrome_frame_test::TimedMsgLoop loop_;
   MockAutomationProxy proxy_;
   scoped_ptr<AutomationHandleTracker> tracker_;
   MockAutomationMessageSender dummy_sender_;
   scoped_refptr<TabProxy> tab_;
   // the victim of all tests
   scoped_refptr<ChromeFrameAutomationClient> client_;
 
-  FilePath profile_path_;
+  std::wstring profile_;
   int timeout_;
   void* id_;  // Automation server id we are going to return
   int tab_handle_;   // Tab handle. Any non-zero value is Ok.
 
   inline ChromeFrameAutomationProxy* get_proxy() {
     return static_cast<ChromeFrameAutomationProxy*>(&proxy_);
   }
 
   inline void CreateTab() {
     ASSERT_EQ(NULL, tab_.get());
     tab_ = new TabProxy(&dummy_sender_, tracker_.get(), tab_handle_);
   }
 
   // Easy methods to set expectations.
   void SetAutomationServerOk();
   void Set_CFD_LaunchFailed(AutomationLaunchResult result);
 
  protected:
-  CFACMockTest()
-    : tracker_(NULL), timeout_(500),
-      profile_path_(
-        chrome_frame_test::GetProfilePath(L"Adam.N.Epilinter")) {
+  CFACMockTest() : tracker_(NULL), timeout_(500),
+      profile_(L"Adam.N.Epilinter") {
     id_ = reinterpret_cast<void*>(5);
     tab_handle_ = 3;
   }
 
   virtual void SetUp() {
     dummy_sender_.ForwardTo(&proxy_);
     tracker_.reset(new AutomationHandleTracker());
 
     client_ = new ChromeFrameAutomationClient;
     client_->set_proxy_factory(&factory_);
   }
 };
 
 
-#endif  // CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_
+#endif  // CHROME_FRAME_AUTOMATION_CLIENT_MOCK_H_