Revert 148046 - Revert 147650 - Implement installation of the Chrome App Host.

chrome/installer/util/installation_state.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/installation_state.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/version.h"
 #include "base/win/registry.h"
@@ skipping 208 matching lines @@
 }
 
 // static
 int InstallationState::IndexFromDistType(BrowserDistribution::Type type) {
   COMPILE_ASSERT(BrowserDistribution::CHROME_BROWSER == CHROME_BROWSER_INDEX,
                  unexpected_chrome_browser_distribution_value_);
   COMPILE_ASSERT(BrowserDistribution::CHROME_FRAME == CHROME_FRAME_INDEX,
                  unexpected_chrome_frame_distribution_value_);
   COMPILE_ASSERT(BrowserDistribution::CHROME_BINARIES == CHROME_BINARIES_INDEX,
                  unexpected_chrome_frame_distribution_value_);
+  COMPILE_ASSERT(BrowserDistribution::CHROME_APP_HOST == CHROME_APP_HOST_INDEX,
+                 unexpected_chrome_frame_distribution_value_);
   DCHECK(type == BrowserDistribution::CHROME_BROWSER ||
          type == BrowserDistribution::CHROME_FRAME ||
-         type == BrowserDistribution::CHROME_BINARIES);
+         type == BrowserDistribution::CHROME_BINARIES ||
+         type == BrowserDistribution::CHROME_APP_HOST);
   return type;
 }
 
 void InstallationState::Initialize() {
   BrowserDistribution* distribution;
 
   distribution = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BROWSER);
   user_products_[CHROME_BROWSER_INDEX].Initialize(false, distribution);
   system_products_[CHROME_BROWSER_INDEX].Initialize(true, distribution);
 
   distribution = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_FRAME);
   user_products_[CHROME_FRAME_INDEX].Initialize(false, distribution);
   system_products_[CHROME_FRAME_INDEX].Initialize(true, distribution);
 
   distribution = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BINARIES);
   user_products_[CHROME_BINARIES_INDEX].Initialize(false, distribution);
   system_products_[CHROME_BINARIES_INDEX].Initialize(true, distribution);
+
+  distribution = BrowserDistribution::GetSpecificDistribution(
+      BrowserDistribution::CHROME_APP_HOST);
+  user_products_[CHROME_APP_HOST_INDEX].Initialize(false, distribution);
+  system_products_[CHROME_APP_HOST_INDEX].Initialize(true, distribution);
 }
 
 const ProductState* InstallationState::GetNonVersionedProductState(
     bool system_install,
     BrowserDistribution::Type type) const {
   const ProductState& product_state = (system_install ? system_products_ :
       user_products_)[IndexFromDistType(type)];
   return &product_state;
 }
 
 const ProductState* InstallationState::GetProductState(
     bool system_install,
     BrowserDistribution::Type type) const {
   const ProductState* product_state =
       GetNonVersionedProductState(system_install, type);
   return product_state->version_.get() == NULL ? NULL : product_state;
 }
 }  // namespace installer