Fix memory leak in chrome/browser/chromeos/input_method/input_method_util.cc.

chrome/browser/chromeos/input_method/input_method_util.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.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/chromeos/cros/keyboard_library.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "grit/generated_resources.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 
 namespace {
 
 // Map from language code to associated input method IDs, etc.
 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
 struct IdMaps {
-  LanguageCodeToIdsMap* language_code_to_ids;
-  std::map<std::string, std::string>* id_to_language_code;
-  std::map<std::string, std::string>* id_to_display_name;
+  scoped_ptr<LanguageCodeToIdsMap> language_code_to_ids;
+  scoped_ptr<std::map<std::string, std::string> > id_to_language_code;
+  scoped_ptr<std::map<std::string, std::string> > id_to_display_name;
 
  private:
   IdMaps() : language_code_to_ids(NULL),
              id_to_language_code(NULL),
              id_to_display_name(NULL) {
     chromeos::InputMethodLibrary* library =
         chromeos::CrosLibrary::Get()->GetInputMethodLibrary();
     scoped_ptr<chromeos::InputMethodDescriptors> supported_input_methods(
         library->GetSupportedInputMethods());
     if (supported_input_methods->size() <= 1) {
       LOG(ERROR) << "GetSupportedInputMethods returned a fallback ID";
       // TODO(yusukes): Handle this error in nicer way.
     }
 
-    language_code_to_ids = new LanguageCodeToIdsMap;
-    id_to_language_code = new std::map<std::string, std::string>;
-    id_to_display_name = new std::map<std::string, std::string>;
+    language_code_to_ids.reset(new LanguageCodeToIdsMap);
+    id_to_language_code.reset(new std::map<std::string, std::string>);
+    id_to_display_name.reset(new std::map<std::string, std::string>);
 
     // Build the id to descriptor map for handling kExtraLanguages later.
     typedef std::map<std::string,
         const chromeos::InputMethodDescriptor*> DescMap;
     DescMap id_to_descriptor_map;
 
     for (size_t i = 0; i < supported_input_methods->size(); ++i) {
       const chromeos::InputMethodDescriptor& input_method =
           supported_input_methods->at(i);
       const std::string language_code =
@@ skipping 549 matching lines @@
   value.string_list_value = input_method_ids;
   InputMethodLibrary* library = CrosLibrary::Get()->GetInputMethodLibrary();
   library->SetImeConfig(kGeneralSectionName, kPreloadEnginesConfigName, value);
   if (!initial_input_method_id.empty()) {
     library->ChangeInputMethod(initial_input_method_id);
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos