[Extensions] Fix override urls' visible urls

chrome/browser/extensions/extension_web_ui.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/extensions/extension_web_ui.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 430 matching lines @@
   Profile* profile = Profile::FromBrowserContext(browser_context);
   const base::DictionaryValue* overrides =
       profile->GetPrefs()->GetDictionary(kExtensionURLOverrides);
   if (!overrides)
     return false;
 
   // Find the reverse mapping based on the given URL. For example this maps the
   // internal URL
   // chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html#1 to
   // chrome://bookmarks/#1 for display in the omnibox.
-  for (base::DictionaryValue::Iterator it(*overrides); !it.IsAtEnd();
-       it.Advance()) {
-    const base::ListValue* url_list = NULL;
-    if (!it.value().GetAsList(&url_list))
+  for (base::DictionaryValue::Iterator dict_iter(*overrides);
+       !dict_iter.IsAtEnd(); dict_iter.Advance()) {
+    const base::ListValue* url_list = nullptr;
+    if (!dict_iter.value().GetAsList(&url_list))
       continue;
 
-    for (base::ListValue::const_iterator it2 = url_list->begin();
-         it2 != url_list->end(); ++it2) {
+    for (base::ListValue::const_iterator list_iter = url_list->begin();
+         list_iter != url_list->end(); ++list_iter) {
+      const base::DictionaryValue* dict = nullptr;
+      if (!(*list_iter)->GetAsDictionary(&dict))
+        continue;
       std::string override;
-      if (!(*it2)->GetAsString(&override))
+      if (!dict->GetString(kEntry, &override))
         continue;
       if (base::StartsWith(url->spec(), override,
                            base::CompareCase::SENSITIVE)) {
         GURL original_url(content::kChromeUIScheme + std::string("://") +
-                          it.key() + url->spec().substr(override.length()));
+                          dict_iter.key() +
+                          url->spec().substr(override.length()));
         *url = original_url;
         return true;
       }
     }
   }
 
   return false;
 }
 
 // static
@@ skipping 76 matching lines @@
         extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
         gfx::Size(pixel_size, pixel_size),
         resource_scale_factor));
   }
 
   // LoadImagesAsync actually can run callback synchronously. We want to force
   // async.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(
       extension, info_list, base::Bind(&RunFaviconCallbackAsync, callback));
 }