Revert 69165 - Merge the installer, installer_util and setup_util namespaces ...

ceee/installer_dll/installer_helper.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.
 //
 // Small DLL shim to register and unregister all CEEE components.
 
 #include "ceee/installer_dll/installer_helper.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 245 matching lines @@
 HRESULT SetCeeeChannelModifier(bool new_value) {
   std::wstring reg_key(ceee_module_util::GetCromeFrameClientStateKey());
 
   base::win::RegKey key;
   if (!key.Open(HKEY_LOCAL_MACHINE, reg_key.c_str(), KEY_ALL_ACCESS)) {
     // Omaha didn't install the key.  Perhaps no Omaha?  That's ok.
     return S_OK;
   }
 
   // We create the "ap" value if it doesn't exist.
-  installer::ChannelInfo channel_info;
+  installer_util::ChannelInfo channel_info;
   channel_info.Initialize(key);
 
   if (channel_info.SetCeee(new_value) && !channel_info.Write(&key)) {
     return E_FAIL;
   }
 
   // Everything we need is already done!
   return S_OK;
 }
 
@@ skipping 119 matching lines @@
   LOG(WARNING) << "Call to unimplemented DllRegisterUserServer.";
   return S_OK;
 }
 
 // No-op entry point to keep user-level unregistration happy.
 // TODO(robertshield): Remove this as part of registration re-org.
 STDAPI DllUnregisterUserServer() {
   LOG(WARNING) << "Call to unimplemented DllUnregisterUserServer.";
   return S_OK;
 }