Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/.

chrome/browser/character_encoding.cc

 // Copyright (c) 2012 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 89 matching lines @@
   { "windows-1258", "Windows-1258" },
 };
 
 const int kCanonicalDisplayNameOverridesLength =
     arraysize(kCanonicalDisplayNameOverrides);
 
 typedef std::map<std::string, const char*> CanonicalNameDisplayNameMapType;
 
 class CanonicalEncodingMap {
  public:
-  CanonicalEncodingMap()
-      : id_to_encoding_name_map_(NULL),
-        encoding_name_to_id_map_(NULL),
-        encoding_name_to_display_name_map_(NULL) { }
+  CanonicalEncodingMap() {}

[Nico, 2013/06/12 04:42:27]

Maybe delete this completely?

[dcheng, 2013/06/12 12:01:27]

We can't, due to the DISALLOW_COPY_AND_ASSIGN macro.

   const IdToCanonicalEncodingNameMapType* GetIdToCanonicalEncodingNameMapData();
   const CanonicalEncodingNameToIdMapType* GetCanonicalEncodingNameToIdMapData();
   const CanonicalNameDisplayNameMapType* GetCanonicalNameDisplayNameMapData();
   std::vector<int>* locale_dependent_encoding_ids() {
     return &locale_dependent_encoding_ids_;
   }
 
   std::vector<CharacterEncoding::EncodingInfo>* current_display_encodings() {
     return &current_display_encodings_;
   }
@@ skipping 413 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;
 }