Continue to remove CHROME_FRAME_BUILD define from code that goes into chrome....

chrome/installer/util/browser_distribution.cc

 // Copyright (c) 2006-2009 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"
 
+#include "base/command_line.h"
 #include "base/registry.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/env_vars.h"
+#include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
-#include "chrome/installer/util/chrome_frame_distribution.h"
+#include "chrome/installer/util/install_util.h"
 
 BrowserDistribution* BrowserDistribution::GetDistribution() {
+  return GetDistribution(InstallUtil::IsChromeFrameProcess());
+}
+
+BrowserDistribution* BrowserDistribution::GetDistribution(bool chrome_frame) {
   static BrowserDistribution* dist = NULL;
   if (dist == NULL) {
-#if defined(CHROME_FRAME_BUILD)
-    dist = new ChromeFrameDistribution();
-#elif defined(GOOGLE_CHROME_BUILD)
-    dist = new GoogleChromeDistribution();
+    if (chrome_frame) {
+      // TODO(robertshield): Make one of these for Google Chrome vs
+      // non Google Chrome builds?
+      dist = new ChromeFrameDistribution();
+    } else {
+#if defined(GOOGLE_CHROME_BUILD)
+      dist = new GoogleChromeDistribution();
 #else
-    dist = new BrowserDistribution();
+      dist = new BrowserDistribution();
 #endif
+    }
   }
   return dist;
 }
 
 void BrowserDistribution::DoPostUninstallOperations(
     const installer::Version& version, const std::wstring& local_data_path,
     const std::wstring& distribution_data) {
 }
 
 std::wstring BrowserDistribution::GetApplicationName() {
@@ skipping 54 matching lines @@
 }
 
 void BrowserDistribution::LaunchUserExperiment(
     installer_util::InstallStatus status, const installer::Version& version,
     bool system_install) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor) {
 }