Fix extension content verification handling of ./ in icon paths

extensions/browser/content_verifier.cc

 // Copyright 2014 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 "extensions/browser/content_verifier.h"
 
 #include <algorithm>
 
 #include "base/files/file_path.h"
 #include "base/stl_util.h"
@@ skipping 194 matching lines @@
        i != relative_paths.end();
        ++i) {
     const base::FilePath& relative_path = *i;
 
     if (relative_path == base::FilePath(kManifestFilename))
       continue;
 
     if (ContainsKey(browser_images, relative_path))
       continue;
 
+    // The browser image paths from the extension may not be normalized (eg
+    // they might have leading '/' or './'), so we need to compare basename and
+    // dirname separately.
+    bool browser_image_match = false;
+    for (const auto& image_path : browser_images) {

[Ken Rockot(use gerrit already), 2014/10/07 17:25:51]

YAY AUTO

+      if (image_path.BaseName() == relative_path.BaseName() &&
+          image_path.DirName() == relative_path.DirName()) {

[Ken Rockot(use gerrit already), 2014/10/07 17:25:51]

Discussed offline, but probably want to compare individual components with
GetComponents, as DirName will only return the penultimate component.

+        browser_image_match = true;
+        break;
+      }
+    }
+    if (browser_image_match)
+      continue;
+
     base::FilePath full_path = extension_root.Append(relative_path);
     if (locales_dir.IsParent(full_path)) {
       if (!all_locales) {
         // TODO(asargent) - see if we can cache this list longer to avoid
         // having to fetch it more than once for a given run of the
         // browser. Maybe it can never change at runtime? (Or if it can, maybe
         // there is an event we can listen for to know to drop our cache).
         all_locales.reset(new std::set<std::string>);
         extension_l10n_util::GetAllLocales(all_locales.get());
       }
 
       // Since message catalogs get transcoded during installation, we want
       // to skip those paths.
       if (full_path.DirName().DirName() == locales_dir &&
           !extension_l10n_util::ShouldSkipValidation(
               locales_dir, full_path.DirName(), *all_locales))
         continue;
     }
     return true;
   }
   return false;
 }
 
 }  // namespace extensions