Fix content verification failures on unusual content script paths

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/scoped_observer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 307 matching lines @@
                                base::FilePath(FILE_PATH_LITERAL("page.html")),
                                JobObserver::Result::SUCCESS);
   job_observer.ExpectJobResult(id, base::FilePath(FILE_PATH_LITERAL("page.js")),
                                JobObserver::Result::SUCCESS);
   job_observer.ExpectJobResult(
       id, base::FilePath(FILE_PATH_LITERAL("dir/page2.html")),
       JobObserver::Result::SUCCESS);
   job_observer.ExpectJobResult(id,
                                base::FilePath(FILE_PATH_LITERAL("page2.js")),
                                JobObserver::Result::SUCCESS);
+  job_observer.ExpectJobResult(id, base::FilePath(FILE_PATH_LITERAL("cs1.js")),
+                               JobObserver::Result::SUCCESS);
+  job_observer.ExpectJobResult(id, base::FilePath(FILE_PATH_LITERAL("cs2.js")),
+                               JobObserver::Result::SUCCESS);
+
+  VerifierObserver verifier_observer;
+  ContentVerifier::SetObserverForTests(&verifier_observer);
 
   // Install a test extension we copied from the webstore that has actual
-  // signatures, and contains image paths with leading "./".
+  // signatures, and contains paths with a leading "./" in various places.
   const Extension* extension = InstallExtensionFromWebstore(
       test_data_dir_.AppendASCII("content_verifier/dot_slash_paths.crx"), 1);
 
   ASSERT_TRUE(extension);
   ASSERT_EQ(extension->id(), id);
 
+  // The content scripts might fail verification the first time since the
+  // one-time processing might not be finished yet - if that's the case then
+  // we want to wait until that work is done.
+  if (!ContainsKey(verifier_observer.completed_fetches(), id))
+    verifier_observer.WaitForFetchComplete(id);
+
+  // Now disable/re-enable the extension to cause the content scripts to be
+  // read again.
+  DisableExtension(id);
+  EnableExtension(id);
+
   EXPECT_TRUE(job_observer.WaitForExpectedJobs());
 
   ContentVerifyJob::SetObserverForTests(NULL);
 }
 
 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, ContentScripts) {
   VerifierObserver verifier_observer;
   ContentVerifier::SetObserverForTests(&verifier_observer);
 
   // Install an extension with content scripts. The initial read of the content
@@ skipping 34 matching lines @@
   job_observer.ExpectJobResult(id,
                                base::FilePath(FILE_PATH_LITERAL("script.js")),
                                JobObserver::Result::FAILURE);
   EnableExtension(id);
   EXPECT_TRUE(job_observer.WaitForExpectedJobs());
 
   ContentVerifyJob::SetObserverForTests(NULL);
 }
 
 }  // namespace extensions