Remove unnecessary Platform::createMessagePortChannel method

Introduce WebMessagePortChannelImpl::CreatePair to avoid duplicated
code and to avoid using the WebMessagePortChannel::entangle method.

BUG=361001

Review URL: https://codereview.chromium.org/230183002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262669 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 13 deletions

diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 10bca94..3a57f94 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -142,18 +142,11 @@ bool WorkerWebKitPlatformSupportImpl::isLinkVisited(
   return false;
 }
 
-WebMessagePortChannel*
-WorkerWebKitPlatformSupportImpl::createMessagePortChannel() {
-  return new WebMessagePortChannelImpl(child_thread_loop_.get());
-}
-
 void WorkerWebKitPlatformSupportImpl::createMessageChannel(
     blink::WebMessagePortChannel** channel1,
     blink::WebMessagePortChannel** channel2) {
-  *channel1 = new WebMessagePortChannelImpl(child_thread_loop_.get());
-  *channel2 = new WebMessagePortChannelImpl(child_thread_loop_.get());
-  (*channel1)->entangle(*channel2);
-  (*channel2)->entangle(*channel1);
+  WebMessagePortChannelImpl::CreatePair(
+      child_thread_loop_.get(), channel1, channel2);
 }
 
 void WorkerWebKitPlatformSupportImpl::setCookies(
diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
index 5805483..9fa56d4 100644
--- a/content/worker/worker_webkitplatformsupport_impl.h
+++ b/content/worker/worker_webkitplatformsupport_impl.h
@@ -47,10 +47,8 @@ class WorkerWebKitPlatformSupportImpl : public BlinkPlatformImpl,
   virtual unsigned long long visitedLinkHash(const char* canonicalURL,
                                              size_t length);
   virtual bool isLinkVisited(unsigned long long linkHash);
-  virtual blink::WebMessagePortChannel* createMessagePortChannel();
-  virtual void createMessageChannel(
-      blink::WebMessagePortChannel** channel1,
-      blink::WebMessagePortChannel** channel2);
+  virtual void createMessageChannel(blink::WebMessagePortChannel** channel1,
+                                    blink::WebMessagePortChannel** channel2);
   virtual void setCookies(const blink::WebURL& url,
                           const blink::WebURL& first_party_for_cookies,
                           const blink::WebString& value);