Remove remaining references to CEEE.

chrome/installer/util/google_update_settings.cc

 // Copyright (c) 2011 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/path_service.h"
@@ skipping 105 matching lines @@
   if (key.ReadValueDW(google_update::kRegEULAAceptedField,
                       &previous_value) != ERROR_SUCCESS)
     return FOUND_CLIENT_STATE;
 
   return ((previous_value != 0) == setting) ?
       FOUND_SAME_SETTING : FOUND_OPPOSITE_SETTING;
 }
 
 bool GetChromeChannelInternal(bool system_install,
                               bool add_multi_modifier,
-                              std::wstring* channel) {
+                              string16* 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();
+  string16 reg_path = dist->GetStateKey();
   RegKey key(root_key, reg_path.c_str(), KEY_READ);
 
   installer::ChannelInfo channel_info;
   if (!channel_info.Initialize(key)) {
     channel->assign(L"unknown");
     return false;
   }
 
   if (!channel_info.GetChannelName(channel)) {
     channel->assign(L"unknown");
@@ skipping 225 matching lines @@
                                              system_level);
 }
 
 std::wstring GoogleUpdateSettings::GetChromeChannel(bool system_install) {
   std::wstring channel;
   GetChromeChannelInternal(system_install, false, &channel);
   return channel;
 }
 
 bool GoogleUpdateSettings::GetChromeChannelAndModifiers(bool system_install,
-                                                        std::wstring* channel) {
+                                                        string16* channel) {
   return GetChromeChannelInternal(system_install, true, channel);
 }
 
 void GoogleUpdateSettings::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type, int install_return_code,
     const std::wstring& product_guid) {
   DCHECK(archive_type != installer::UNKNOWN_ARCHIVE_TYPE ||
          install_return_code != 0);
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
@@ skipping 129 matching lines @@
       GetUpdatePolicyFromDword(value, &update_policy);
     }
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   if (is_overridden != NULL)
     *is_overridden = found_override;
 
   return update_policy;
 }