Merge 242400 "Remove installation of Chrome Frame."

chrome/installer/util/browser_distribution.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.
 //
 // This file defines a class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 41 matching lines @@
 bool IsChromeFrameModule() {
   base::FilePath module_path;
   PathService::Get(base::FILE_MODULE, &module_path);
   return base::FilePath::CompareEqualIgnoreCase(module_path.BaseName().value(),
                                           installer::kChromeFrameDll);
 }
 
 BrowserDistribution::Type GetCurrentDistributionType() {
   // TODO(erikwright): If the app host is installed, but not Chrome, perhaps
   // this should return CHROME_APP_HOST.
-  static BrowserDistribution::Type type =
-      (MasterPreferences::ForCurrentProcess().install_chrome_frame() ||
-       IsChromeFrameModule()) ?
-          BrowserDistribution::CHROME_FRAME :
-          BrowserDistribution::CHROME_BROWSER;
-  return type;
+  return BrowserDistribution::CHROME_BROWSER;
 }
 
 }  // end namespace
 
 BrowserDistribution::BrowserDistribution()
     : type_(CHROME_BROWSER) {
 }
 
 BrowserDistribution::BrowserDistribution(Type type)
     : type_(type) {
@@ skipping 221 matching lines @@
     installer::InstallStatus install_status) {
 }
 
 bool BrowserDistribution::ShouldSetExperimentLabels() {
   return false;
 }
 
 bool BrowserDistribution::HasUserExperiments() {
   return false;
 }