Share the "get CF profile dir" code between ChromeFramePlugin and chrome_frame_test_utils.h.

chrome_frame/test/automation_client_mock.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

[robertshield, 2012/05/02 20:05:13]

2012

[Jói, 2012/05/03 11:41:52]

Done.

 // 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_
 
 #include <windows.h>
 #include <string>
 
 #include "base/string_util.h"
 #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 "chrome_frame/utils.h"
 #include "gmock/gmock.h"
 
 using testing::StrictMock;
 
 // ChromeFrameAutomationClient [CFAC] tests.
 struct MockCFDelegate : public ChromeFrameDelegateImpl {
   MOCK_CONST_METHOD0(GetWindow, WindowType());
   MOCK_METHOD1(GetBounds, void(RECT* bounds));
   MOCK_METHOD0(GetDocumentUrl, std::string());
   MOCK_METHOD2(ExecuteScript, bool(const std::string& script,
@@ skipping 137 matching lines @@
     tab_ = new TabProxy(&dummy_sender_, tracker_.get(), tab_handle_);
   }
 
   // Easy methods to set expectations.
   void SetAutomationServerOk(int times);
   void Set_CFD_LaunchFailed(AutomationLaunchResult result);
 
  protected:
   CFACMockTest()
     : tracker_(NULL), timeout_(500),
-      returned_proxy_(static_cast<ChromeFrameAutomationProxy*>(&mock_proxy_)),
-      profile_path_(
-        chrome_frame_test::GetProfilePath(L"Adam.N.Epilinter")) {
+      returned_proxy_(static_cast<ChromeFrameAutomationProxy*>(&mock_proxy_)) {
+    GetChromeFrameProfilePath(&profile_path_, L"Adam.N.Epilinter")
     id_ = reinterpret_cast<void*>(5);
     tab_handle_ = 3;
   }
 
   virtual void SetUp() {
     dummy_sender_.ForwardTo(&mock_proxy_);
     tracker_.reset(new AutomationHandleTracker());
 
     client_ = new ChromeFrameAutomationClient;
     client_->set_proxy_factory(&factory_);
   }
 };
 
 #endif  // CHROME_FRAME_TEST_AUTOMATION_CLIENT_MOCK_H_