[Merge m59] Only whitelist messages.json files in _locales for content verification

extensions/browser/content_verifier.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_CONTENT_VERIFIER_H_
 #define EXTENSIONS_BROWSER_CONTENT_VERIFIER_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 62 matching lines @@
   void OnExtensionUnloaded(content::BrowserContext* browser_context,
                            const Extension* extension,
                            UnloadedExtensionInfo::Reason reason) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentVerifier);
 
   friend class base::RefCountedThreadSafe<ContentVerifier>;
   ~ContentVerifier() override;
 
-  void OnFetchComplete(const std::string& extension_id,
-                       bool success,
-                       bool was_force_check,
-                       const std::set<base::FilePath>& hash_mismatch_paths);
+  void OnFetchComplete(
+      const std::string& extension_id,
+      bool success,
+      bool was_force_check,
+      const std::set<base::FilePath>& hash_mismatch_unix_paths);
 
   void OnFetchCompleteHelper(const std::string& extension_id,
                              bool shouldVerifyAnyPathsResult);
 
-  // Returns true if any of the paths in |relative_paths| *should* have their
-  // contents verified. (Some files get transcoded during the install process,
-  // so we don't want to verify their contents because they are expected not
-  // to match).
-  bool ShouldVerifyAnyPaths(const std::string& extension_id,
-                            const base::FilePath& extension_root,
-                            const std::set<base::FilePath>& relative_paths);
+  // Returns true if any of the paths in |relative_unix_paths| *should* have
+  // their contents verified. (Some files get transcoded during the install
+  // process, so we don't want to verify their contents because they are
+  // expected not to match).
+  bool ShouldVerifyAnyPaths(
+      const std::string& extension_id,
+      const base::FilePath& extension_root,
+      const std::set<base::FilePath>& relative_unix_paths);
 
   // Set to true once we've begun shutting down.
   bool shutdown_;
 
   content::BrowserContext* context_;
 
   std::unique_ptr<ContentVerifierDelegate> delegate_;
 
   // For fetching content hash signatures.
   std::unique_ptr<ContentHashFetcher> fetcher_;
 
   // For observing the ExtensionRegistry.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> observer_;
 
   // Data that should only be used on the IO thread.
   scoped_refptr<ContentVerifierIOData> io_data_;
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_CONTENT_VERIFIER_H_