Fix IE version check.

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>
 #include <shlobj.h>
 #include <winsock2.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/process_util.h"
+#include "base/string_number_conversions.h"
+#include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/utils.h"
@@ skipping 381 matching lines @@
   return hr;
 }
 
 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);
+  std::wstring path(chrome_frame_test::GetExecutableAppPath(kIEImageName));
+  std::wstring version(GetExeVersion(path));
+  size_t first_dot = version.find(L'.');
+  int major_version = 0;
+  if (!base::StringToInt(base::StringPiece16(
+          version.data(),
+          first_dot == std::wstring::npos ? version.size() : first_dot),
+                         &major_version)) {
+    return IE_UNSUPPORTED;
+  }
 
-  switch (version[0]) {
-    case '6':
+  switch (major_version) {
+    case 6:
       return IE_6;
-    case '7':
+    case 7:
       return IE_7;
-    case '8':
+    case 8:
       return IE_8;
-    case '9':
+    case 9:
       return IE_9;
-    case '10':
+    case 10:
       return IE_10;
     default:
       break;
   }
 
   return IE_UNSUPPORTED;
 }
 
 FilePath GetProfilePathForIE() {
   FilePath profile_path;
@@ skipping 252 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