Merge 67890 - Always use persistent profile for CF+CEEE installs....

chrome_frame/test/chrome_frame_test_utils.cc

 // 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.
 
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <iepmapi.h>
 #include <sddl.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
+#include "ceee/ie/common/ceee_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome_frame/utils.h"
 
 namespace chrome_frame_test {
 
 const wchar_t kCrashServicePipeName[] = L"\\\\.\\pipe\\ChromeCrashServices";
 
 const DWORD kCrashServicePipeDesiredAccess = FILE_READ_DATA |
@@ skipping 356 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();
@@ skipping 12 matching lines @@
       return IE_8;
     case '9':
       return IE_9;
     default:
       break;
   }
 
   return IE_UNSUPPORTED;
 }
 
+// TODO(joi@chromium.org) Could share this code with chrome_frame_plugin.h
 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_8) {
-    profile_path = GetProfilePath(kIEProfileName);
-  } else {
+  if (GetInstalledIEVersion() <= IE_7 && !ceee_util::IsIeCeeeRegistered()) {
     profile_path = GetIETemporaryFilesFolder();
     profile_path = profile_path.Append(L"Google Chrome Frame");
+  } else {
+    profile_path = GetProfilePath(kIEProfileName);
   }
   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 144 matching lines @@
     // First check to see if it's even still running just to minimize the
     // likelihood of spurious error messages from KillProcess.
     if (WAIT_OBJECT_0 != ::WaitForSingleObject(crash_service, 0)) {
       base::KillProcess(crash_service, 0, false);
     }
     return NULL;
   }
 }
 
 }  // namespace chrome_frame_test