Only whitelist messages.json files in _locales for content verification

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 <utility>
 #include <vector>
 
@@ skipping 111 matching lines @@
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(&ContentVerifier::VerifyFailed, this, extension_id, reason));
     return;
   }
   if (shutdown_)
     return;
 
-  VLOG(1) << "VerifyFailed " << extension_id << " reason:" << reason;
+  LOG(WARNING) << "VerifyFailed " << extension_id << " reason:" << reason;
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(context_);
   const Extension* extension =
       registry->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);
 
   if (!extension)
     return;
 
   if (reason == ContentVerifyJob::MISSING_ALL_HASHES) {
     // If we failed because there were no hashes yet for this extension, just
     // request some.
     fetcher_->DoFetch(extension, true /* force */);
   } else {
     delegate_->VerifyFailed(extension_id, reason);
   }
 }
 
 void ContentVerifier::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const Extension* extension) {
   if (shutdown_)
     return;
 
+  LOG(WARNING) << "ContentVerifier::OnExtensionLoaded " << extension->id();
+
   ContentVerifierDelegate::Mode mode = delegate_->ShouldBeVerified(*extension);
   if (mode != ContentVerifierDelegate::NONE) {
     // The browser image paths from the extension may not be relative (eg
     // they might have leading '/' or './'), so we strip those to make
     // comparing to actual relative paths work later on.
     std::set<base::FilePath> original_image_paths =
         delegate_->GetBrowserImagePaths(extension);
 
     std::unique_ptr<std::set<base::FilePath>> image_paths(
         new std::set<base::FilePath>);
@@ skipping 40 matching lines @@
     const std::string& extension_id,
     bool success,
     bool was_force_check,
     const std::set<base::FilePath>& hash_mismatch_paths) {
   if (g_test_observer)
     g_test_observer->OnFetchComplete(extension_id, success);
 
   if (shutdown_)
     return;
 
-  VLOG(1) << "OnFetchComplete " << extension_id << " success:" << success;
+  LOG(WARNING) << "OnFetchComplete " << extension_id << " success:" << success;
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(context_);
   const Extension* extension =
       registry->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);
   if (!delegate_ || !extension)
     return;
 
   ContentVerifierDelegate::Mode mode = delegate_->ShouldBeVerified(*extension);
   if (was_force_check && !success &&
       mode == ContentVerifierDelegate::ENFORCE_STRICT) {
@@ skipping 45 matching lines @@
       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.
+      // to skip those paths. See if this path looks like
+      // _locales/<some locale>/messages.json - if so then skip it.
       if (full_path.DirName().DirName() == locales_dir &&
-          !extension_l10n_util::ShouldSkipValidation(
-              locales_dir, full_path.DirName(), *all_locales))
+          base::ContainsKey(*all_locales,
+                            full_path.DirName().BaseName().MaybeAsASCII()) &&
+          full_path == full_path.DirName().Append(kMessagesFilename))
         continue;
     }
     return true;
   }
   return false;
 }
 
 }  // namespace extensions