Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/installer_state_unittest.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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 65 matching lines @@
 void BuildSingleChromeState(const base::FilePath& target_dir,
                             MockInstallerState* installer_state) {
   CommandLine cmd_line = CommandLine::FromString(L"setup.exe");
   MasterPreferences prefs(cmd_line);
   InstallationState machine_state;
   machine_state.Initialize();
   installer_state->Initialize(cmd_line, prefs, machine_state);
   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";
 wchar_t text_content_2[] = L"delete me as well";
 
 // Delete version directories. Everything lower than the given version
 // should be deleted.
 TEST_F(InstallerStateTest, Delete) {
   // TODO(grt): move common stuff into the test fixture.
   // Create a Chrome dir
@@ skipping 525 matching lines @@
                      BrowserDistribution::GetSpecificDistribution(
                          BrowserDistribution::CHROME_BINARIES)->
                          GetInstallSubDir().c_str()));
   EXPECT_FALSE(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.multi_package_binaries_distribution());
   EXPECT_TRUE(installer_state.FindProduct(BrowserDistribution::CHROME_BROWSER));
-  EXPECT_FALSE(installer_state.FindProduct(BrowserDistribution::CHROME_FRAME));
 
-  // Now initialize it to install system-level single Chrome Frame.
+  // Now initialize it to install system-level single Chrome.
   {
     CommandLine cmd_line(
-        CommandLine::FromString(L"setup.exe --system-level --chrome-frame "
-                                L"--verbose-logging"));
+        CommandLine::FromString(L"setup.exe --system-level --verbose-logging"));
     MasterPreferences prefs(cmd_line);
     installer_state.Initialize(cmd_line, prefs, machine_state);
   }
 
   // Confirm that the old state is gone.
   EXPECT_EQ(InstallerState::SYSTEM_LEVEL, installer_state.level());
   EXPECT_EQ(InstallerState::SINGLE_PACKAGE, installer_state.package_type());
   EXPECT_EQ(InstallerState::SINGLE_INSTALL_OR_UPDATE,
             installer_state.operation());
   EXPECT_TRUE(wcsstr(installer_state.target_path().value().c_str(),
                      BrowserDistribution::GetSpecificDistribution(
-                         BrowserDistribution::CHROME_FRAME)->
+                         BrowserDistribution::CHROME_BROWSER)->
                          GetInstallSubDir().c_str()));
   EXPECT_TRUE(installer_state.verbose_logging());
-  // 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));
+  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));
 }
 
 // A fixture for testing InstallerState::DetermineCriticalVersion.  Individual
 // tests must invoke Initialize() with a critical version.
 class InstallerStateCriticalVersionTest : public ::testing::Test {
  protected:
   InstallerStateCriticalVersionTest() : cmd_line_(CommandLine::NO_PROGRAM) {}
 
   // Creates a set of versions for use by all test runs.
   static void SetUpTestCase() {
@@ skipping 134 matching lines @@
   // Critical update newer than the new version.
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid());
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(opv_version_, *pv_version_)
           .IsValid());
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(pv_version_, *pv_version_)
           .IsValid());
 }