Fixes incorrect test against OS version instead of browser version

BUG=28038,29193
TEST=on any XP box this should pass: chrome_frame_test.exe --gtest_filter=*CFInstall*

Review URL: http://codereview.chromium.org/469012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34020 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 12 deletions

diff --git a/chrome_frame/CFInstall.js b/chrome_frame/CFInstall.js
index bddfe3bb..e8190cb6 100644
--- a/chrome_frame/CFInstall.js
+++ b/chrome_frame/CFInstall.js
@@ -271,12 +271,12 @@
     // We currently only support CF in IE
     // TODO(slightlyoff): Update this should we support other browsers!
     var ua = navigator.userAgent;
-    var ieRe = /MSIE \S+; Windows NT/;
+    var ieRe = /MSIE (\S+); Windows NT/;
     var bail = false;
     if (ieRe.test(ua)) {
       // We also only support Win2003/XPSP2 or better. See:
       //  http://msdn.microsoft.com/en-us/library/ms537503%28VS.85%29.aspx
-      if (parseFloat(ua.split(ieRe)[1]) < 6 &&
+      if (parseFloat(ieRe.exec(ua)[1]) < 6 &&
           // 'SV1' indicates SP2, only bail if not SP2 or Win2K3
           ua.indexOf('SV1') < 0) {
         bail = true;
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index 4d62e74..81edf87 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -585,31 +585,25 @@ TEST_F(ChromeFrameTestWithWebServer, WidgetModeFF_CFInstanceDefaultCtor) {
 
 const wchar_t kCFInstallBasicTestPage[] = L"files/CFInstall_basic.html";
 
-// The following tests have been marked FLAKY as they fail on the buildbot
-// 1. FullTabIE_CFInstallBasic
-// 2. FullTabIE_CFInstallPlace
-// 3. FullTabIE_CFInstallOverlay
-// 4. FullTabIE_CFInstallDismiss
-// Bug http://code.google.com/p/chromium/issues/detail?id=29193
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabIE_CFInstallBasic) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallBasic) {
   SimpleBrowserTest(IE, kCFInstallBasicTestPage, L"CFInstallBasic");
 }
 
 const wchar_t kCFInstallPlaceTestPage[] = L"files/CFInstall_place.html";
 
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabIE_CFInstallPlace) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallPlace) {
   SimpleBrowserTest(IE, kCFInstallPlaceTestPage, L"CFInstallPlace");
 }
 
 const wchar_t kCFInstallOverlayTestPage[] = L"files/CFInstall_overlay.html";
 
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabIE_CFInstallOverlay) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallOverlay) {
   SimpleBrowserTest(IE, kCFInstallOverlayTestPage, L"CFInstallOverlay");
 }
 
 const wchar_t kCFInstallDismissTestPage[] = L"files/CFInstall_dismiss.html";
 
-TEST_F(ChromeFrameTestWithWebServer, FLAKY_FullTabIE_CFInstallDismiss) {
+TEST_F(ChromeFrameTestWithWebServer, FullTabIE_CFInstallDismiss) {
   SimpleBrowserTest(IE, kCFInstallDismissTestPage, L"CFInstallDismiss");
 }