Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/master_preferences_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.
 //
 // Unit tests for master preferences related methods.
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
@@ skipping 282 matching lines @@
         << expected_bool2[i].name;
   }
 
   EXPECT_FALSE(prefs2.GetBool(
       installer::master_preferences::kSystemLevel, &value));
   EXPECT_FALSE(prefs2.GetBool(
       installer::master_preferences::kVerboseLogging, &value));
 }
 
 TEST_F(MasterPreferencesTest, TestDefaultInstallConfig) {
-  std::wstringstream chrome_cmd, cf_cmd;
+  std::wstringstream chrome_cmd;
   chrome_cmd << "setup.exe";
-  cf_cmd << "setup.exe --" << installer::switches::kChromeFrame;
 
   CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
-  CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
 
   installer::MasterPreferences pref_chrome(chrome_install);
-  installer::MasterPreferences pref_cf(cf_install);
 
   EXPECT_FALSE(pref_chrome.is_multi_install());
   EXPECT_TRUE(pref_chrome.install_chrome());
-  EXPECT_FALSE(pref_chrome.install_chrome_frame());
-
-  EXPECT_FALSE(pref_cf.is_multi_install());
-  EXPECT_FALSE(pref_cf.install_chrome());
-  EXPECT_TRUE(pref_cf.install_chrome_frame());
 }
 
 TEST_F(MasterPreferencesTest, TestMultiInstallConfig) {
   using installer::switches::kMultiInstall;
   using installer::switches::kChrome;
-  using installer::switches::kChromeFrame;
 
   std::wstringstream chrome_cmd, cf_cmd, chrome_cf_cmd;
   chrome_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome;
-  cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChromeFrame;
-  chrome_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
-      " --" << kChromeFrame;
 
   CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
-  CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
-  CommandLine chrome_cf_install(CommandLine::FromString(chrome_cf_cmd.str()));
 
   installer::MasterPreferences pref_chrome(chrome_install);
-  installer::MasterPreferences pref_cf(cf_install);
-  installer::MasterPreferences pref_chrome_cf(chrome_cf_install);
 
   EXPECT_TRUE(pref_chrome.is_multi_install());
   EXPECT_TRUE(pref_chrome.install_chrome());
-  EXPECT_FALSE(pref_chrome.install_chrome_frame());
-
-  EXPECT_TRUE(pref_cf.is_multi_install());
-  EXPECT_FALSE(pref_cf.install_chrome());
-  EXPECT_TRUE(pref_cf.install_chrome_frame());
-
-  EXPECT_TRUE(pref_chrome_cf.is_multi_install());
-  EXPECT_TRUE(pref_chrome_cf.install_chrome());
-  EXPECT_TRUE(pref_chrome_cf.install_chrome_frame());
 }
 
 TEST_F(MasterPreferencesTest, EnforceLegacyCreateAllShortcutsFalse) {
   static const char kCreateAllShortcutsFalsePrefs[] =
       "{"
       "  \"distribution\": {"
       "     \"create_all_shortcuts\": false"
       "  }"
       "}";
 
@@ skipping 134 matching lines @@
   // The MasterPreferences dictionary should also conjure up the new setting
   // as per EnforceLegacyPreferences.
   const base::ListValue* new_startup_urls_list = NULL;
   EXPECT_TRUE(master_dictionary.GetList(prefs::kURLsToRestoreOnStartup,
                                         &new_startup_urls_list));
   ASSERT_TRUE(new_startup_urls_list != NULL);
   std::string new_url_value;
   EXPECT_TRUE(new_startup_urls_list->GetString(0, &new_url_value));
   EXPECT_EQ("http://www.example.com", new_url_value);
 }