Oilpan: simplify plugin container finalization.

third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 758 matching lines @@
     params.loadManually = loadManually;
 
     WebPlugin* webPlugin = m_webFrame->client()->createPlugin(m_webFrame, params);
     if (!webPlugin)
         return nullptr;
 
     // The container takes ownership of the WebPlugin.
     RefPtrWillBeRawPtr<WebPluginContainerImpl> container =
         WebPluginContainerImpl::create(element, webPlugin);
 
-    if (!webPlugin->initialize(container.get())) {
-#if ENABLE(OILPAN)
-        container->dispose();
-#endif
+    if (!webPlugin->initialize(container.get()))
         return nullptr;
-    }
 
-    if (policy != AllowDetachedPlugin && !element->layoutObject()) {
-#if ENABLE(OILPAN)
-        container->dispose();
-#endif
+    if (policy != AllowDetachedPlugin && !element->layoutObject())
         return nullptr;
-    }
 
     return container;
 }
 
 PassOwnPtr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
     HTMLMediaElement& htmlMediaElement,
     const WebURL& url,
     WebMediaPlayerClient* client)
 {
     WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(
@@ skipping 189 matching lines @@
 
 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, SuddenTerminationDisablerType type)
 {
     if (m_webFrame->client()) {
         m_webFrame->client()->suddenTerminationDisablerChanged(
             present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(type));
     }
 }
 
 } // namespace blink