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

chrome_frame/test/chrome_frame_test_utils.cc

 // Copyright (c) 2012 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.
 
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <iepmapi.h>
 #include <sddl.h>
@@ skipping 395 matching lines @@
     cocreate_flags |= CLSCTX_ENABLE_CLOAKING;
   }
 
   hr = ::CoCreateInstance(CLSID_InternetExplorer, NULL,
                           cocreate_flags, IID_IWebBrowser2,
                           reinterpret_cast<void**>(web_browser));
   // ~LowIntegrityToken() will switch integrity back to medium.
   return hr;
 }
 
-// TODO(joi@chromium.org) Could share this code with chrome_frame_plugin.h
-FilePath GetProfilePath(const std::wstring& profile_name) {
-  FilePath profile_path;
-  chrome::GetChromeFrameUserDataDirectory(&profile_path);
-  return profile_path.Append(profile_name);
-}
-
 std::wstring GetExeVersion(const std::wstring& exe_path) {
   scoped_ptr<FileVersionInfo> ie_version_info(
       FileVersionInfo::CreateFileVersionInfo(FilePath(exe_path)));
   return ie_version_info->product_version();
 }
 
 IEVersion GetInstalledIEVersion() {
   std::wstring path = chrome_frame_test::GetExecutableAppPath(kIEImageName);
   std::wstring version = GetExeVersion(path);
 
@@ skipping 18 matching lines @@
 FilePath GetProfilePathForIE() {
   FilePath profile_path;
   // Browsers without IDeleteBrowsingHistory in non-priv mode
   // have their profiles moved into "Temporary Internet Files".
   // The code below basically retrieves the version of IE and computes
   // the profile directory accordingly.
   if (GetInstalledIEVersion() <= IE_7) {
     profile_path = GetIETemporaryFilesFolder();
     profile_path = profile_path.Append(L"Google Chrome Frame");
   } else {
-    profile_path = GetProfilePath(kIEProfileName);
+    GetChromeFrameProfilePath(kIEProfileName, &profile_path);
   }
   return profile_path;
 }
 
 FilePath GetTestDataFolder() {
   FilePath test_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &test_dir);
   test_dir = test_dir.Append(FILE_PATH_LITERAL("chrome_frame"))
       .Append(FILE_PATH_LITERAL("test"))
       .Append(FILE_PATH_LITERAL("data"));
@@ skipping 235 matching lines @@
   if (address.empty()) {
     LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be "
                << "run over the loopback adapter, which may result in hangs.";
     address.assign("127.0.0.1");
   }
 
   return address;
 }
 
 }  // namespace chrome_frame_test