Adding the option to drop in a new BrowserDistribution instance for experimentation.

Review URL: http://codereview.chromium.org/202049

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25950 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 1 deletions

diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 915d0cf..be5dc87 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -31,6 +31,10 @@
           'include_dirs': [
             '../..',
           ],
+          'variables': {
+            'extra_installer_util_sources%': [
+            ],
+          },
           'sources': [
             'util/browser_distribution.cc',
             'util/browser_distribution.h',
@@ -84,6 +88,7 @@
             'util/work_item_list.h',
             '../common/json_value_serializer.cc',
             '../common/pref_names.cc',
+            '<@(extra_installer_util_sources)',
           ],
         },
         {
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 25555ac..19b5937 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -12,10 +12,16 @@
 #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
+
 BrowserDistribution* BrowserDistribution::GetDistribution() {
   static BrowserDistribution* dist = NULL;
   if (dist == NULL) {
-#if defined(GOOGLE_CHROME_BUILD)
+#if defined(CHROME_EXP_BUILD)
+    dist = new ExperimentalBrowserDistribution();
+#elif defined(GOOGLE_CHROME_BUILD)
     dist = new GoogleChromeDistribution();
 #else
     dist = new BrowserDistribution();