Committing http://codereview.chromium.org/3420004/show for grt@...

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>
@@ skipping 390 matching lines @@
   std::wstring path = chrome_frame_test::GetExecutableAppPath(kIEImageName);
   std::wstring version = GetExeVersion(path);
 
   switch (version[0]) {
     case '6':
       return IE_6;
     case '7':
       return IE_7;
     case '8':
       return IE_8;
+    case '9':
+      return IE_9;
     default:
       break;
   }
 
   return IE_UNSUPPORTED;
 }
 
 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) {
+  if (GetInstalledIEVersion() >= IE_8) {
     profile_path = GetProfilePath(kIEProfileName);
   } else {
     profile_path = GetIETemporaryFilesFolder();
     profile_path = profile_path.Append(L"Google Chrome Frame");
   }
   return profile_path;
 }
 
 FilePath GetTestDataFolder() {
   FilePath test_dir;
@@ skipping 69 matching lines @@
   }
 
   DLOG(INFO) << "Started crash_service.exe so you know if a test crashes!";
   // This sleep is to ensure that the crash service is done initializing, i.e
   // the pipe creation, etc.
   Sleep(500);
   return crash_service;
 }
 
 }  // namespace chrome_frame_test