Test app launcher registration in test_installer rather than InstallationValidator.

chrome/installer/util/installation_validator.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.
 
 // Implementation of the installation validator.
 
 #include "chrome/installer/util/installation_validator.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #include "base/logging.h"
-#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
-#include "base/win/registry.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
-#include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installation_state.h"
-#include "chrome/installer/util/updating_app_registration_data.h"
 
 namespace installer {
 
 BrowserDistribution::Type
     InstallationValidator::ChromeRules::distribution_type() const {
   return BrowserDistribution::CHROME_BROWSER;
 }
 
 void InstallationValidator::ChromeRules::AddUninstallSwitchExpectations(
     const ProductContext& ctx,
@@ skipping 514 matching lines @@
   if (product_state != NULL) {
     ChromeRules chrome_rules;
     ValidateProduct(machine_state, system_level, *product_state,
                     chrome_rules, &rock_on);
     *type = static_cast<InstallationType>(
         *type | (product_state->is_multi_install() ?
                  ProductBits::CHROME_MULTI :
                  ProductBits::CHROME_SINGLE));
   }
 
-#if defined(GOOGLE_CHROME_BUILD)
-  if (!InstallUtil::IsChromeSxSProcess()) {
-    // Usage of the app launcher is tracked alongside Chrome.
-    const HKEY root_key = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-    base::string16 launcher_key(
-        UpdatingAppRegistrationData(kAppLauncherGuid).GetVersionKey());
-    base::win::RegKey key(root_key, launcher_key.c_str(),
-                          KEY_QUERY_VALUE | KEY_WOW64_32KEY);
-    bool have_launcher =
-        key.Valid() && key.HasValue(google_update::kRegVersionField);
-
-    BrowserDistribution* chrome_dist =
-        BrowserDistribution::GetSpecificDistribution(
-            BrowserDistribution::CHROME_BROWSER);
-    if (!have_launcher) {
-      LOG_IF(ERROR, product_state) << "App launcher is not installed with "
-                                   << chrome_dist->GetDisplayName();
-    } else {
-      LOG_IF(ERROR, !product_state) << "App launcher is installed without "
-                                    << chrome_dist->GetDisplayName();
-    }
-  }
-#endif  // GOOGLE_CHROME_BUILD
-
   // Is Chrome Frame installed?
   product_state =
       machine_state.GetProductState(system_level,
                                     BrowserDistribution::CHROME_FRAME);
   if (product_state != NULL) {
     ChromeFrameRules chrome_frame_rules;
     ValidateProduct(machine_state, system_level, *product_state,
                     chrome_frame_rules, &rock_on);
     int cf_bit = !product_state->is_multi_install() ?
         ProductBits::CHROME_FRAME_SINGLE :
@@ skipping 15 matching lines @@
                                                      InstallationType* type) {
   DCHECK(type);
   InstallationState machine_state;
 
   machine_state.Initialize();
 
   return ValidateInstallationTypeForState(machine_state, system_level, type);
 }
 
 }  // namespace installer