Revert of Fix content verifier problem with content scripts

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 <set>
 #include <string>
 
@@ skipping 19 matching lines @@
 class Extension;
 class ContentHashFetcher;
 class ContentVerifierIOData;
 
 // Used for managing overall content verification - both fetching content
 // hashes as needed, and supplying job objects to verify file contents as they
 // are read.
 class ContentVerifier : public base::RefCountedThreadSafe<ContentVerifier>,
                         public ExtensionRegistryObserver {
  public:
-  class TestObserver {
-   public:
-    virtual void OnFetchComplete(const std::string& extension_id,
-                                 bool success) = 0;
-  };
-  static void SetObserverForTests(TestObserver* observer);
-
   // Takes ownership of |delegate|.
   ContentVerifier(content::BrowserContext* context,
                   ContentVerifierDelegate* delegate);
   void Start();
   void Shutdown();
 
   // Call this before reading a file within an extension. The caller owns the
   // returned job.
   ContentVerifyJob* CreateJobFor(const std::string& extension_id,
                                  const base::FilePath& extension_root,
@@ skipping 46 matching lines @@
   // 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_