Refactor of BrowserDistribution.

chrome/installer/setup/setup_util.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.
 //
 // This file declares util functions for setup project.
 
 #include "chrome/installer/setup/setup_util.h"
 
 #include <windows.h>
 
@@ skipping 376 matching lines @@
   // Copy usagestats from the binaries to the product's ClientState key.
   product = machine_state.GetProductState(system_level,
                                           BrowserDistribution::CHROME_BINARIES);
   DWORD usagestats = 0;
   if (product && product->GetUsageStats(&usagestats)) {
     dist = product_to_migrate.distribution();
     result = state_key.Open(root, dist->GetStateKey().c_str(),
                             KEY_SET_VALUE);
     if (result != ERROR_SUCCESS) {
       LOG(ERROR) << "Failed opening ClientState key for "
-                 << dist->GetAppShortCutName() << " to migrate usagestats.";
+                 << dist->GetDisplayName() << " to migrate usagestats.";
     } else {
       state_key.WriteValue(google_update::kRegUsageStatsField, usagestats);
     }
   }
 
   // Remove the migrating product from the "ap" value of other multi-install
   // products.
   for (int i = 0; i < BrowserDistribution::NUM_TYPES; ++i) {
     BrowserDistribution::Type type =
         static_cast<BrowserDistribution::Type>(i);
     if (type == to_migrate)
       continue;
     product = machine_state.GetProductState(system_level, type);
     if (product && product->is_multi_install()) {
       installer::ChannelInfo channel_info;
       dist = BrowserDistribution::GetSpecificDistribution(type);
       result = state_key.Open(root, dist->GetStateKey().c_str(),
                               KEY_QUERY_VALUE | KEY_SET_VALUE);
       if (result == ERROR_SUCCESS &&
           channel_info.Initialize(state_key) &&
           product_to_migrate.SetChannelFlags(false, &channel_info)) {
-        VLOG(1) << "Moving " << dist->GetAppShortCutName()
+        VLOG(1) << "Moving " << dist->GetDisplayName()
                 << " to channel: " << channel_info.value();
         channel_info.Write(&state_key);
       }
     }
   }
 
   // Remove -multi, all product modifiers, and everything else but the channel
   // name from the "ap" value of the product to migrate.
   dist = product_to_migrate.distribution();
   result = state_key.Open(root, dist->GetStateKey().c_str(),
                           KEY_QUERY_VALUE | KEY_SET_VALUE);
   if (result == ERROR_SUCCESS) {
     installer::ChannelInfo channel_info;
     if (!channel_info.Initialize(state_key)) {
-      LOG(ERROR) << "Failed reading " << dist->GetAppShortCutName()
+      LOG(ERROR) << "Failed reading " << dist->GetDisplayName()
                  << " channel info.";
     } else if (channel_info.RemoveAllModifiersAndSuffixes()) {
-      VLOG(1) << "Moving " << dist->GetAppShortCutName()
+      VLOG(1) << "Moving " << dist->GetDisplayName()
               << " to channel: " << channel_info.value();
       channel_info.Write(&state_key);
     }
   }
 }
 
 ScopedTokenPrivilege::ScopedTokenPrivilege(const wchar_t* privilege_name)
     : is_enabled_(false) {
   if (!::OpenProcessToken(::GetCurrentProcess(),
                           TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,
@@ skipping 25 matching lines @@
 }
 
 ScopedTokenPrivilege::~ScopedTokenPrivilege() {
   if (is_enabled_ && previous_privileges_.PrivilegeCount != 0) {
     ::AdjustTokenPrivileges(token_, FALSE, &previous_privileges_,
                             sizeof(TOKEN_PRIVILEGES), NULL, NULL);
   }
 }
 
 }  // namespace installer