| Index: extensions/browser/script_executor.cc
|
| diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc
|
| index 0502d898475180afa41575d82c99c294e3bf3666..4f35a3c5283d0968d430d53109338b60927795c7 100644
|
| --- a/extensions/browser/script_executor.cc
|
| +++ b/extensions/browser/script_executor.cc
|
| @@ -33,7 +33,7 @@ const char* kRendererDestroyed = "The tab was closed.";
|
| // 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,
|
| @@ -147,7 +147,7 @@ class Handler : public content::WebContentsObserver {
|
| 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_;
|
| @@ -185,7 +185,7 @@ 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) {
|
|
|