NO CODE CHANGE.

chrome/browser/character_encoding.cc

 // Copyright (c) 2006-2008 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/browser/character_encoding.h"
 
 #include <map>
 #include <set>
 
 #include "base/logging.h"
@@ skipping 67 matching lines @@
  public:
   CanonicalEncodingMap()
       : id_to_encoding_name_map_(NULL),
         encoding_name_to_id_map_(NULL) { }
   const IdToCanonicalEncodingNameMapType* GetIdToCanonicalEncodingNameMapData();
   const CanonicalEncodingNameToIdMapType* GetCanonicalEncodingNameToIdMapData();
   std::vector<int>* const locale_dependent_encoding_ids() {
     return &locale_dependent_encoding_ids_;
   }
 
-  std::vector<CharacterEncoding::EncodingInfo>* const current_display_encodings() {
+  std::vector<CharacterEncoding::EncodingInfo>* const
+      current_display_encodings() {
     return &current_display_encodings_;
   }
 
  private:
   scoped_ptr<IdToCanonicalEncodingNameMapType> id_to_encoding_name_map_;
   scoped_ptr<CanonicalEncodingNameToIdMapType> encoding_name_to_id_map_;
   std::vector<int> locale_dependent_encoding_ids_;
   std::vector<CharacterEncoding::EncodingInfo> current_display_encodings_;
 
   DISALLOW_EVIL_CONSTRUCTORS(CanonicalEncodingMap);
 };
 
-const IdToCanonicalEncodingNameMapType* CanonicalEncodingMap::GetIdToCanonicalEncodingNameMapData() {
+const IdToCanonicalEncodingNameMapType*
+    CanonicalEncodingMap::GetIdToCanonicalEncodingNameMapData() {
   // Testing and building map is not thread safe, this function is supposed to
   // only run in UI thread. Myabe I should add a lock in here for making it as
   // thread safe.
   if (!id_to_encoding_name_map_.get()) {
     id_to_encoding_name_map_.reset(new IdToCanonicalEncodingNameMapType);
     for (int i = 0; i < canonical_encoding_names_length; ++i) {
       int resource_id = canonical_encoding_names[i].resource_id;
       (*id_to_encoding_name_map_)[resource_id] =
         std::make_pair(canonical_encoding_names[i].name,
                        canonical_encoding_names[i].category_string_id);
     }
   }
   return id_to_encoding_name_map_.get();
 }
 
-const CanonicalEncodingNameToIdMapType* CanonicalEncodingMap::GetCanonicalEncodingNameToIdMapData() {
+const CanonicalEncodingNameToIdMapType*
+    CanonicalEncodingMap::GetCanonicalEncodingNameToIdMapData() {
   if (!encoding_name_to_id_map_.get()) {
     encoding_name_to_id_map_.reset(new CanonicalEncodingNameToIdMapType);
     for (int i = 0; i < canonical_encoding_names_length; ++i) {
       (*encoding_name_to_id_map_)[canonical_encoding_names[i].name] =
           canonical_encoding_names[i].resource_id;
     }
   }
   return encoding_name_to_id_map_.get();
 }
 
@@ skipping 202 matching lines @@
     return ASCIIToWide(canonical_name);
   else
     return std::wstring();
 }
 
 // Static
 // According to the behavior of user recently selected encoding short list in
 // FireFox, we always put UTF-8 as toppest position, after then put user
 // recently selected encodings, then put local dependent encoding items.
 // At last, we put all rest encoding items.
-const std::vector<CharacterEncoding::EncodingInfo>* CharacterEncoding::GetCurrentDisplayEncodings(
+const std::vector<CharacterEncoding::EncodingInfo>*
+    CharacterEncoding::GetCurrentDisplayEncodings(
     const std::wstring& locale,
     const std::wstring& locale_encodings,
     const std::wstring& recently_select_encodings) {
   std::vector<int>* const locale_dependent_encoding_list =
       canonical_encoding_name_map_singleton.locale_dependent_encoding_ids();
   std::vector<CharacterEncoding::EncodingInfo>* const encoding_list =
       canonical_encoding_name_map_singleton.current_display_encodings();
 
   // Initialize locale dependent static encoding list.
   if (locale_dependent_encoding_list->empty() && !locale_encodings.empty())
@@ skipping 109 matching lines @@
   // Insert new encoding to head of selected encoding list.
   *selected_encodings = encoding_name;
   // Generate the string for rest selected encoding list.
   for (std::vector<int>::const_iterator it = selected_encoding_list.begin();
        it != selected_encoding_list.end(); ++it) {
     selected_encodings->append(1, L',');
     selected_encodings->append(GetCanonicalEncodingNameByCommandId(*it));
   }
   return true;
 }