Remove BrowserDistribution::Type.

chrome/installer/util/product_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/product.h"
 
 #include <memory>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
 using installer::Product;
 using installer::MasterPreferences;
 using registry_util::RegistryOverrideManager;
 
 TEST(ProductTest, ProductInstallBasic) {
   // TODO(tommi): We should mock this and use our mocked distribution.
   const bool multi_install = false;
   const bool system_level = true;
   base::CommandLine cmd_line = base::CommandLine::FromString(
       std::wstring(L"setup.exe") +
       (multi_install ? L" --multi-install --chrome" : L"") +
       (system_level ? L" --system-level" : L""));
   installer::MasterPreferences prefs(cmd_line);
   installer::InstallationState machine_state;
   machine_state.Initialize();
 
-  std::unique_ptr<Product> product = base::MakeUnique<Product>(
-      BrowserDistribution::GetSpecificDistribution(
-          BrowserDistribution::CHROME_BROWSER));
+  std::unique_ptr<Product> product =
+      base::MakeUnique<Product>(BrowserDistribution::GetDistribution());
   product->InitializeFromPreferences(prefs);
   BrowserDistribution* distribution = product->distribution();
-  EXPECT_EQ(BrowserDistribution::CHROME_BROWSER, distribution->GetType());
 
   base::FilePath user_data_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   EXPECT_FALSE(user_data_dir.empty());
 
   base::FilePath program_files;
   ASSERT_TRUE(PathService::Get(base::DIR_PROGRAM_FILES, &program_files));
   // The User Data path should never be under program files, even though
   // system_level is true.
   EXPECT_EQ(std::wstring::npos,
@@ skipping 43 matching lines @@
     if (chrome_state)
       EXPECT_TRUE(chrome_state->is_msi());
   }
 }
 
 TEST(ProductTest, LaunchChrome) {
   // TODO(tommi): Test Product::LaunchChrome and
   // Product::LaunchChromeAndWait.
   NOTIMPLEMENTED();
 }