| Index: third_party/WebKit/Source/bindings/core/v8/ScriptController.h
 | 
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
 | 
| index 78a6ca909ccdbee9eaaef65a84c88c5db164c71e..95f1b614ebce72c17e0f4984a27ed5f22ef7d6e9 100644
 | 
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
 | 
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptController.h
 | 
| @@ -66,18 +66,17 @@ enum ReasonForCallingCanExecuteScripts {
 | 
|      NotAboutToExecuteScript
 | 
|  };
 | 
|  
 | 
| -class CORE_EXPORT ScriptController final : public NoBaseWillBeGarbageCollectedFinalized<ScriptController> {
 | 
| +class CORE_EXPORT ScriptController final : public GarbageCollectedFinalized<ScriptController> {
 | 
|      WTF_MAKE_NONCOPYABLE(ScriptController);
 | 
| -    USING_FAST_MALLOC_WILL_BE_REMOVED(ScriptController);
 | 
|  public:
 | 
|      enum ExecuteScriptPolicy {
 | 
|          ExecuteScriptWhenScriptsDisabled,
 | 
|          DoNotExecuteScriptWhenScriptsDisabled
 | 
|      };
 | 
|  
 | 
| -    static PassOwnPtrWillBeRawPtr<ScriptController> create(LocalFrame* frame)
 | 
| +    static RawPtr<ScriptController> create(LocalFrame* frame)
 | 
|      {
 | 
| -        return adoptPtrWillBeNoop(new ScriptController(frame));
 | 
| +        return (new ScriptController(frame));
 | 
|      }
 | 
|  
 | 
|      ~ScriptController();
 | 
| @@ -102,7 +101,7 @@ public:
 | 
|      //
 | 
|      // FIXME: Get rid of extensionGroup here.
 | 
|      // FIXME: We don't want to support multiple scripts.
 | 
| -    void executeScriptInIsolatedWorld(int worldID, const WillBeHeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value>>* results);
 | 
| +    void executeScriptInIsolatedWorld(int worldID, const HeapVector<ScriptSourceCode>& sources, int extensionGroup, Vector<v8::Local<v8::Value>>* results);
 | 
|  
 | 
|      // Returns true if argument is a JavaScript URL.
 | 
|      bool executeScriptIfJavaScriptURL(const KURL&);
 | 
| @@ -162,11 +161,11 @@ private:
 | 
|  
 | 
|      LocalFrame* frame() const { return toLocalFrame(m_windowProxyManager->frame()); }
 | 
|  
 | 
| -    typedef WillBeHeapHashMap<RawPtrWillBeMember<Widget>, NPObject*> PluginObjectMap;
 | 
| +    typedef HeapHashMap<Member<Widget>, NPObject*> PluginObjectMap;
 | 
|  
 | 
|      v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy, double* compilationFinishTime = 0);
 | 
|  
 | 
| -    OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
 | 
| +    Member<WindowProxyManager> m_windowProxyManager;
 | 
|      const String* m_sourceURL;
 | 
|  
 | 
|      // A mapping between Widgets and their corresponding script object.
 | 
| 
 |