Replace more ObserverList with base::ObserverList.

extensions/browser/script_executor.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 "extensions/browser/script_executor.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/pickle.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 const char* kRendererDestroyed = "The tab was closed.";
 
 // A handler for a single injection request. On creation this will send the
 // injection request to the renderer, and it will be destroyed after either the
 // corresponding response comes from the renderer, or the renderer is destroyed.
 class Handler : public content::WebContentsObserver {
  public:
-  Handler(ObserverList<ScriptExecutionObserver>* script_observers,
+  Handler(base::ObserverList<ScriptExecutionObserver>* script_observers,
           content::WebContents* web_contents,
           ExtensionMsg_ExecuteCode_Params* params,
           ScriptExecutor::FrameScope scope,
           int* request_id_counter,
           const ScriptExecutor::ExecuteScriptCallback& callback)
       : content::WebContentsObserver(web_contents),
         script_observers_(AsWeakPtr(script_observers)),
         host_id_(params->host_id),
         main_request_id_((*request_id_counter)++),
         sub_request_id_(scope == ScriptExecutor::ALL_FRAMES ?
@@ skipping 93 matching lines @@
   }
 
   void Finish(const std::string& error,
               const GURL& url,
               const base::ListValue& result) {
     if (!callback_.is_null())
       callback_.Run(error, url, result);
     delete this;
   }
 
-  base::WeakPtr<ObserverList<ScriptExecutionObserver>> script_observers_;
+  base::WeakPtr<base::ObserverList<ScriptExecutionObserver>> script_observers_;
 
   // The id of the host (the extension or the webui) doing the injection.
   HostID host_id_;
 
   // The request id of the injection into the main frame.
   int main_request_id_;
 
   // The request id of the injection into any sub frames. We need a separate id
   // for these so that we know which frame to use as the first result, and which
   // error (if any) to use.
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(Handler);
 };
 
 }  // namespace
 
 ScriptExecutionObserver::~ScriptExecutionObserver() {
 }
 
 ScriptExecutor::ScriptExecutor(
     content::WebContents* web_contents,
-    ObserverList<ScriptExecutionObserver>* script_observers)
+    base::ObserverList<ScriptExecutionObserver>* script_observers)
     : next_request_id_(0),
       web_contents_(web_contents),
       script_observers_(script_observers) {
   CHECK(web_contents_);
 }
 
 ScriptExecutor::~ScriptExecutor() {
 }
 
 void ScriptExecutor::ExecuteScript(const HostID& host_id,
@@ skipping 32 matching lines @@
   params.file_url = file_url;
   params.wants_result = (result_type == JSON_SERIALIZED_RESULT);
   params.user_gesture = user_gesture;
 
   // Handler handles IPCs and deletes itself on completion.
   new Handler(script_observers_, web_contents_, &params, frame_scope,
               &next_request_id_, callback);
 }
 
 }  // namespace extensions