Remove remaining references to CEEE.

chrome/installer/util/google_update_settings.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 #include "chrome/installer/util/util_constants.h"
 
 class BrowserDistribution;
 
 namespace installer {
 class ChannelInfo;
 class InstallationState;
 }
 
 // This class provides accessors to the Google Update 'ClientState' information
@@ skipping 94 matching lines @@
   // "unknown" if unknown. This value will not be modified by "-m" for a
   // multi-install.
   static std::wstring GetChromeChannel(bool system_install);
 
   // Return a human readable modifier for the version string, e.g.
   // the channel (dev, beta, stable). Returns true if this operation succeeded,
   // on success, channel contains one of "", "unknown", "dev" or "beta" (unless
   // it is a multi-install product, in which case it will return "m",
   // "unknown-m", "dev-m", or "beta-m").
   static bool GetChromeChannelAndModifiers(bool system_install,
-                                           std::wstring* channel);
+                                           string16* channel);
 
   // This method changes the Google Update "ap" value to move the installation
   // on to or off of one of the recovery channels.
   // - If incremental installer fails we append a magic string ("-full"), if
   // it is not present already, so that Google Update server next time will send
   // full installer to update Chrome on the local machine
   // - If we are currently running full installer, we remove this magic
   // string (if it is present) regardless of whether installer failed or not.
   // There is no fall-back for full installer :)
   // - Unconditionally remove "-multifail" since we haven't crashed.
@@ skipping 41 matching lines @@
   // Group Policy settings.  |is_overridden|, if non-NULL, is populated with
   // true if an app-specific policy override is in force, or false otherwise.
   static UpdatePolicy GetAppUpdatePolicy(const std::wstring& app_guid,
                                          bool* is_overridden);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_SETTINGS_H_