Revert 69167, itself a revert of 69165 - Merge the installer, installer_util ...

chrome/installer/util/google_update_settings.cc

Index: chrome/installer/util/google_update_settings.cc
===================================================================
--- chrome/installer/util/google_update_settings.cc	(revision 69167)
+++ chrome/installer/util/google_update_settings.cc	(working copy)
@@ -165,7 +165,7 @@
   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;
@@ -190,7 +190,7 @@
   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);
@@ -223,7 +223,7 @@
 
 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: "