Revert of Remove installation of Chrome Frame.

chrome/installer/util/installer_state_unittest.cc

Index: chrome/installer/util/installer_state_unittest.cc
diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc
index 3b7c73b2c71c80e27d5f6e42f01e28e201078c02..b11961bcc229727d6d1662bc58620bc44197dc11 100644
--- a/chrome/installer/util/installer_state_unittest.cc
+++ b/chrome/installer/util/installer_state_unittest.cc
@@ -83,6 +83,8 @@
   installer_state->set_target_path(target_dir);
   EXPECT_TRUE(installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER)
       != NULL);
+  EXPECT_TRUE(installer_state->FindProduct(BrowserDistribution::CHROME_FRAME)
+      == NULL);
 }
 
 wchar_t text_content_1[] = L"delete me";
@@ -628,11 +630,13 @@
   EXPECT_EQ(installer_state.state_type(), BrowserDistribution::CHROME_BROWSER);
   EXPECT_TRUE(installer_state.multi_package_binaries_distribution());
   EXPECT_TRUE(installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER));
-
-  // Now initialize it to install system-level single Chrome.
+  EXPECT_FALSE(installer_state.FindProduct(BrowserDistribution::CHROME_FRAME));
+
+  // Now initialize it to install system-level single Chrome Frame.
   {
     CommandLine cmd_line(
-        CommandLine::FromString(L"setup.exe --system-level --verbose-logging"));
+        CommandLine::FromString(L"setup.exe --system-level --chrome-frame "
+                                L"--verbose-logging"));
     MasterPreferences prefs(cmd_line);
     installer_state.Initialize(cmd_line, prefs, machine_state);
   }
@@ -644,14 +648,18 @@
             installer_state.operation());
   EXPECT_TRUE(wcsstr(installer_state.target_path().value().c_str(),
                      BrowserDistribution::GetSpecificDistribution(
-                         BrowserDistribution::CHROME_BROWSER)->
+                         BrowserDistribution::CHROME_FRAME)->
                          GetInstallSubDir().c_str()));
   EXPECT_TRUE(installer_state.verbose_logging());
-  EXPECT_EQ(installer_state.state_key(),
-            BrowserDistribution::GetSpecificDistribution(
-                BrowserDistribution::CHROME_BROWSER)->GetStateKey());
-  EXPECT_EQ(installer_state.state_type(), BrowserDistribution::CHROME_BROWSER);
-  EXPECT_TRUE(installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER));
+  // state_key and type are wrong in unittests since it is set based on the
+  // current process's BrowserDistribution.
+  // EXPECT_EQ(installer_state.state_key(),
+  //           BrowserDistribution::GetSpecificDistribution(
+  //               BrowserDistribution::CHROME_FRAME)->GetStateKey());
+  // EXPECT_EQ(installer_state.state_type(), BrowserDistribution::CHROME_FRAME);
+  EXPECT_FALSE(
+      installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER));
+  EXPECT_TRUE(installer_state.FindProduct(BrowserDistribution::CHROME_FRAME));
 }
 
 // A fixture for testing InstallerState::DetermineCriticalVersion.  Individual