Remove BrowserDistribution::Type.

chrome/installer/util/google_update_settings_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.
 
 #include "chrome/installer/util/google_update_settings.h"
 
 #include <windows.h>
 #include <shlwapi.h>  // For SHDeleteKey.
 #include <stddef.h>
 
@@ skipping 109 matching lines @@
                 << "\" for ap=\"" << ap << "\"";
           }
         }
       }
     }
   }
 
   // Test the writing and deleting functionality of the experiments label
   // helper.
   void TestExperimentsLabelHelper(SystemUserInstall install) {
-    BrowserDistribution* chrome =
-        BrowserDistribution::GetSpecificDistribution(
-            BrowserDistribution::CHROME_BROWSER);
+    BrowserDistribution* chrome = BrowserDistribution::GetDistribution();
     base::string16 value;
 #if defined(GOOGLE_CHROME_BUILD)
     EXPECT_TRUE(chrome->ShouldSetExperimentLabels());
 
     // Before anything is set, ReadExperimentLabels should succeed but return
     // an empty string.
     EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
         install == SYSTEM_INSTALL, &value));
     EXPECT_EQ(base::string16(), value);
 
@@ skipping 1040 matching lines @@
   static base::string16* chrome_state_key_;
   static base::string16* chrome_state_medium_key_;
   registry_util::RegistryOverrideManager override_manager_;
 };
 
 base::string16* CollectStatsConsent::chrome_version_key_;
 base::string16* CollectStatsConsent::chrome_state_key_;
 base::string16* CollectStatsConsent::chrome_state_medium_key_;
 
 void CollectStatsConsent::SetUpTestCase() {
-  BrowserDistribution* dist =
-      BrowserDistribution::GetSpecificDistribution(
-          BrowserDistribution::CHROME_BROWSER);
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   chrome_version_key_ = new base::string16(dist->GetVersionKey());
   chrome_state_key_ = new base::string16(dist->GetStateKey());
   chrome_state_medium_key_ = new base::string16(dist->GetStateMediumKey());
 }
 
 void CollectStatsConsent::TearDownTestCase() {
   delete chrome_version_key_;
   delete chrome_state_key_;
   delete chrome_state_medium_key_;
 }
@@ skipping 105 matching lines @@
                                  StatsState::TRUE_SETTING),
                       StatsState(StatsState::kSystemLevel,
                                  StatsState::TRUE_SETTING,
                                  StatsState::NO_SETTING),
                       StatsState(StatsState::kSystemLevel,
                                  StatsState::TRUE_SETTING,
                                  StatsState::FALSE_SETTING),
                       StatsState(StatsState::kSystemLevel,
                                  StatsState::TRUE_SETTING,
                                  StatsState::TRUE_SETTING)));