Cleaning up after the initial Chrome Frame commit.

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/registry.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
-
-#if defined(CHROME_EXP_BUILD)
-#include "chrome/installer/util/exp/experimental_browser_distribution.h"
-#endif
+#include "chrome/installer/util/chrome_frame_distribution.h"
 
 BrowserDistribution* BrowserDistribution::GetDistribution() {
   static BrowserDistribution* dist = NULL;
   if (dist == NULL) {
-#if defined(CHROME_EXP_BUILD)
-    dist = new ExperimentalBrowserDistribution();
+#if defined(CHROME_FRAME_BUILD)
+    dist = new ChromeFrameDistribution();
 #elif defined(GOOGLE_CHROME_BUILD)
     dist = new GoogleChromeDistribution();
 #else
     dist = new BrowserDistribution();
 #endif
   }
   return dist;
 }
 
 void BrowserDistribution::DoPostUninstallOperations(
@@ skipping 59 matching lines @@
 }
 
 void BrowserDistribution::LaunchUserExperiment(
     installer_util::InstallStatus status, const installer::Version& version,
     bool system_install) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor) {
 }