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

chrome/browser/extensions/content_verifier_browsertest.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 <list>
 #include <set>
 #include <string>
 
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
@@ skipping 487 matching lines @@
     // the WebContents.
     AddTabAtIndexToBrowser(browser(), 1, page_url_, ui::PAGE_TRANSITION_LINK,
                            false);
 
     EXPECT_TRUE(unload_observer.WaitForUnload(id));
     ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
     int reasons = prefs->GetDisableReasons(id);
     EXPECT_TRUE(reasons & Extension::DISABLE_CORRUPTED);
   }
 
+  void TestContentScriptExtension(const std::string& crx_relpath,
+                                  const std::string& id,
+                                  const std::string& script_relpath) {
+    VerifierObserver verifier_observer;
+
+    // Install the extension with content scripts. The initial read of the
+    // content scripts will fail verification because they are read before the
+    // content verification system has completed a one-time processing of the
+    // expected hashes. (The extension only contains the root level hashes of
+    // the merkle tree, but the content verification system builds the entire
+    // tree and caches it in the extension install directory - see
+    // ContentHashFetcher for more details).
+    const Extension* extension = InstallExtensionFromWebstore(
+        test_data_dir_.AppendASCII(crx_relpath), 1);
+    ASSERT_TRUE(extension);
+    EXPECT_EQ(id, extension->id());
+
+    // Wait for the content verification code to finish processing the hashes.
+    if (!base::ContainsKey(verifier_observer.completed_fetches(), id))
+      verifier_observer.WaitForFetchComplete(id);
+
+    // Now disable the extension, since content scripts are read at enable time,
+    // set up our job observer, and re-enable, expecting a success this time.
+    DisableExtension(id);
+    JobObserver job_observer;
+    base::FilePath script_relfilepath =
+        base::FilePath().AppendASCII(script_relpath);
+    job_observer.ExpectJobResult(id, script_relfilepath,
+                                 JobObserver::Result::SUCCESS);
+    EnableExtension(id);
+    EXPECT_TRUE(job_observer.WaitForExpectedJobs());
+
+    // Now alter the contents of the content script, reload the extension, and
+    // expect to see a job failure due to the content script content hash not
+    // being what was signed by the webstore.
+    base::FilePath scriptfile = extension->path().AppendASCII(script_relpath);
+    std::string extra = "some_extra_function_call();";
+    ASSERT_TRUE(base::AppendToFile(scriptfile, extra.data(), extra.size()));
+    DisableExtension(id);
+    job_observer.ExpectJobResult(id, script_relfilepath,
+                                 JobObserver::Result::FAILURE);
+    EnableExtension(id);
+    EXPECT_TRUE(job_observer.WaitForExpectedJobs());
+  }
+
  protected:
   JobDelegate delegate_;
   GURL page_url_;
 };
 
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnRead) {
 #if defined(OS_WIN)
   if (content::IsBrowserSideNavigationEnabled() &&
       base::win::GetVersion() >= base::win::VERSION_WIN10) {
     // http://crbug.com/699437
@@ skipping 61 matching lines @@
 
   // Now disable/re-enable the extension to cause the content scripts to be
   // read again.
   DisableExtension(id);
   EnableExtension(id);
 
   EXPECT_TRUE(job_observer.WaitForExpectedJobs());
 }
 
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, ContentScripts) {
-  VerifierObserver verifier_observer;
+  TestContentScriptExtension("content_verifier/content_script.crx",
+                             "jmllhlobpjcnnomjlipadejplhmheiif", "script.js");
+}
 
-  // Install an extension with content scripts. The initial read of the content
-  // scripts will fail verification because they are read before the content
-  // verification system has completed a one-time processing of the expected
-  // hashes. (The extension only contains the root level hashes of the merkle
-  // tree, but the content verification system builds the entire tree and
-  // caches it in the extension install directory - see ContentHashFetcher for
-  // more details).
-  std::string id = "jmllhlobpjcnnomjlipadejplhmheiif";
-  const Extension* extension = InstallExtensionFromWebstore(
-      test_data_dir_.AppendASCII("content_verifier/content_script.crx"), 1);
-  ASSERT_TRUE(extension);
-  ASSERT_EQ(extension->id(), id);
-
-  // Wait for the content verification code to finish processing the hashes.
-  if (!base::ContainsKey(verifier_observer.completed_fetches(), id))
-    verifier_observer.WaitForFetchComplete(id);
-
-  // Now disable the extension, since content scripts are read at enable time,
-  // set up our job observer, and re-enable, expecting a success this time.
-  DisableExtension(id);
-  JobObserver job_observer;
-  job_observer.ExpectJobResult(id,
-                               base::FilePath(FILE_PATH_LITERAL("script.js")),
-                               JobObserver::Result::SUCCESS);
-  EnableExtension(id);
-  EXPECT_TRUE(job_observer.WaitForExpectedJobs());
-
-  // Now alter the contents of the content script, reload the extension, and
-  // expect to see a job failure due to the content script content hash not
-  // being what was signed by the webstore.
-  base::FilePath scriptfile = extension->path().AppendASCII("script.js");
-  std::string extra = "some_extra_function_call();";
-  ASSERT_TRUE(base::AppendToFile(scriptfile, extra.data(), extra.size()));
-  DisableExtension(id);
-  job_observer.ExpectJobResult(id,
-                               base::FilePath(FILE_PATH_LITERAL("script.js")),
-                               JobObserver::Result::FAILURE);
-  EnableExtension(id);
-  EXPECT_TRUE(job_observer.WaitForExpectedJobs());
+IN_PROC_BROWSER_TEST_F(ContentVerifierTest, ContentScriptsInLocales) {
+  TestContentScriptExtension("content_verifier/content_script_locales.crx",
+                             "jaghonccckpcikmliipifpoodmeofoon",
+                             "_locales/en/content_script.js");
 }
 
 // Tests the case of a corrupt extension that is force-installed by policy and
 // should not be allowed to be manually uninstalled/disabled by the user.
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, PolicyCorrupted) {
   ExtensionSystem* system = ExtensionSystem::Get(profile());
   ExtensionService* service = system->extension_service();
 
   // The id of our test extension.
   std::string id("npnbmohejbjohgpjnmjagbafnjhkmgko");
@@ skipping 247 matching lines @@
   // Remove the override and set ExtensionService to update again. The extension
   // should be now installed.
   PolicyExtensionReinstaller::set_policy_reinstall_action_for_test(nullptr);
   service->set_external_updates_disabled_for_test(false);
   delay_tracker.Proceed();
 
   EXPECT_TRUE(registry_observer.WaitForInstall(id_));
 }
 
 }  // namespace extensions