Merge the installer, installer_util and setup_util namespaces into a single i...

chrome/installer/util/google_update_settings.cc

 // Copyright (c) 2010 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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
@@ skipping 147 matching lines @@
 
 bool GoogleUpdateSettings::GetChromeChannel(bool system_install,
     std::wstring* channel) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (dist->GetChromeChannel(channel))
     return true;
 
   HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   std::wstring reg_path = dist->GetStateKey();
   RegKey key(root_key, reg_path.c_str(), KEY_READ);
-  installer_util::ChannelInfo channel_info;
+  installer::ChannelInfo channel_info;
   if (!channel_info.Initialize(key)) {
     *channel = L"unknown";
     return false;
   }
 
   if (!channel_info.GetChannelName(channel))
     *channel = L"unknown";
 
   // Tag the channel name if this is a multi-install product.
   if (channel_info.IsMultiInstall()) {
     if (!channel->empty())
       channel->append(1, L'-');
     channel->append(1, L'm');
   }
 
   return true;
 }
 
 void GoogleUpdateSettings::UpdateDiffInstallStatus(bool system_install,
     bool incremental_install, int install_return_code,
     const std::wstring& product_guid) {
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
   RegKey key;
-  installer_util::ChannelInfo channel_info;
+  installer::ChannelInfo channel_info;
   std::wstring reg_key(google_update::kRegPathClientState);
   reg_key.append(L"\\");
   reg_key.append(product_guid);
   if (!key.Open(reg_root, reg_key.c_str(), KEY_ALL_ACCESS) ||
       !channel_info.Initialize(key)) {
     VLOG(1) << "Application key not found.";
     if (!incremental_install || !install_return_code) {
       VLOG(1) << "Returning without changing application key.";
       key.Close();
       return;
@@ skipping 12 matching lines @@
                               &channel_info) &&
       !channel_info.Write(&key)) {
     LOG(ERROR) << "Failed to write value " << channel_info.value()
                << " to the registry field " << google_update::kRegApField;
   }
   key.Close();
 }
 
 bool GoogleUpdateSettings::UpdateGoogleUpdateApKey(
     bool diff_install, int install_return_code,
-    installer_util::ChannelInfo* value) {
+    installer::ChannelInfo* value) {
   if (!diff_install || !install_return_code) {
     if (value->SetFullInstall(false)) {
       VLOG(1) << "Removed incremental installer failure key; new value: "
               << value->value();
       return true;
     }
   } else if (diff_install && install_return_code) {
     if (value->SetFullInstall(true)) {
       VLOG(1) << "Incremental installer failed, setting failure key; "
                  "new value: "
@@ skipping 48 matching lines @@
   };
   const wchar_t** end = &kBrands[arraysize(kBrands)];
   const wchar_t** found = std::find(&kBrands[0], end, brand);
   if (found != end)
     return true;
   if (StartsWith(brand, L"EUB", true) || StartsWith(brand, L"EUC", true) ||
       StartsWith(brand, L"GGR", true))
     return true;
   return false;
 }