Switch to C++ 11 for-loop in l10n_util.cc

ui/base/l10n/l10n_util.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 "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <memory>
@@ skipping 197 matching lines @@
     "zh_hant_hk",
     "zh_hant_mo",
     "zh_hans_sg",
     "zh_hant_tw"
   };
 
   // Skip all the es_Foo other than es_419 for now.
   if (base::StartsWith(locale_name, "es_",
                        base::CompareCase::INSENSITIVE_ASCII))
     return !base::EndsWith(locale_name, "419", base::CompareCase::SENSITIVE);
-
-  for (size_t i = 0; i < arraysize(kDuplicateNames); ++i) {
-    if (base::EqualsCaseInsensitiveASCII(kDuplicateNames[i], locale_name))
+  for (const char* kduplicatename : kDuplicateNames) {

[jungshik at Google, 2016/11/10 00:16:10]

nit: perhaps, |duplicate_name| would be better. 

+    if (base::EqualsCaseInsensitiveASCII(kduplicatename, locale_name))
       return true;
   }
   return false;
 }
 
 // We added 30+ minimally populated locales with only a few entries
 // (exemplar character set, script, writing direction and its own
 // lanaguage name). These locales have to be distinguished from the
 // fully populated locales to which Chrome is localized.
 bool IsLocalePartiallyPopulated(const std::string& locale_name) {
@@ skipping 159 matching lines @@
   // Google updater uses no, tl, iw and en for our nb, fil, he, and en-US.
   struct {
     const char* source;
     const char* dest;
   } alias_map[] = {
       {"no", "nb"},
       {"tl", "fil"},
       {"iw", "he"},
       {"en", "en-US"},
   };
-
-  for (size_t i = 0; i < arraysize(alias_map); ++i) {
-    if (base::LowerCaseEqualsASCII(lang, alias_map[i].source)) {
-      std::string tmp_locale(alias_map[i].dest);
+  for (const auto& amap : alias_map) {

[jungshik at Google, 2016/11/10 00:16:10]

nit: alias instead of amap ? 

+    if (base::LowerCaseEqualsASCII(lang, amap.source)) {
+      std::string tmp_locale(amap.dest);
       if (IsLocaleAvailable(tmp_locale)) {
         resolved_locale->swap(tmp_locale);
         return true;
       }
     }
   }
 
   return false;
 #endif
 }
@@ skipping 441 matching lines @@
                    std::vector<base::string16>* strings) {
   SortVectorWithStringKey(locale, strings, false);
 }
 
 const std::vector<std::string>& GetAvailableLocales() {
   return g_available_locales.Get();
 }
 
 void GetAcceptLanguagesForLocale(const std::string& display_locale,
                                  std::vector<std::string>* locale_codes) {
-  for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
-    if (!l10n_util::IsLocaleNameTranslated(kAcceptLanguageList[i],
-                                           display_locale)) {
+  for (const char* kaccept_language : kAcceptLanguageList) {

[jungshik at Google, 2016/11/10 00:16:10]

nit: |accept_language| instead of |kaccept_language| ? 

+    if (!l10n_util::IsLocaleNameTranslated(kaccept_language, display_locale)) {
       // TODO(jungshik) : Put them at the end of the list with language codes
       // enclosed by brackets instead of skipping.
       continue;
     }
-    locale_codes->push_back(kAcceptLanguageList[i]);
+    locale_codes->push_back(kaccept_language);
   }
 }
 
 int GetLocalizedContentsWidthInPixels(int pixel_resource_id) {
   int width = 0;
   base::StringToInt(l10n_util::GetStringUTF8(pixel_resource_id), &width);
   DCHECK_GT(width, 0);
   return width;
 }
 
 const char* const* GetAcceptLanguageListForTesting() {
   return kAcceptLanguageList;
 }
 
 size_t GetAcceptLanguageListSizeForTesting() {
   return arraysize(kAcceptLanguageList);
 }
 
 }  // namespace l10n_util