Revert 273866 "Block content scripts from executing until user g..."

trunk/src/extensions/renderer/dispatcher.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_RENDERER_DISPATCHER_H_
 #define EXTENSIONS_RENDERER_DISPATCHER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 161 matching lines @@
   void OnSetSystemFont(const std::string& font_family,
                        const std::string& font_size);
   void OnShouldSuspend(const std::string& extension_id, int sequence_id);
   void OnSuspend(const std::string& extension_id);
   void OnUnloaded(const std::string& id);
   void OnUpdatePermissions(const ExtensionMsg_UpdatePermissions_Params& params);
   void OnUpdateTabSpecificPermissions(int page_id,
                                       int tab_id,
                                       const std::string& extension_id,
                                       const URLPatternSet& origin_set);
-  void OnUpdateUserScripts(base::SharedMemoryHandle scripts,
-                           const std::set<std::string>& extension_ids);
+  void OnUpdateUserScripts(base::SharedMemoryHandle scripts);
   void OnUsingWebRequestAPI(bool adblock,
                             bool adblock_plus,
                             bool other_webrequest);
 
   void UpdateActiveExtensions();
 
   // Sets up the host permissions for |extension|.
   void InitOriginPermissions(const Extension* extension,
                              Feature::Context context_type);
   void UpdateOriginPermissions(UpdatedExtensionPermissionsInfo::Reason reason,
@@ skipping 91 matching lines @@
 
   // True once WebKit has been initialized (and it is therefore safe to poke).
   bool is_webkit_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(Dispatcher);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_DISPATCHER_H_