[Blink, PresentationAPI] Extract duplicate static getters for PresentationController

Preparing PresentationController to be used from modules/remoteplayback/

BUG=517102
TEST=run existing tests

Change-Id: I14f1c431eea6bbf4722f2568393c1bb5d8d45d85
Reviewed-on: https://chromium-review.googlesource.com/518682
Commit-Queue: Anton Vayvod <avayvod@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#476291}

third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp

@@ -16,22 +16,6 @@
 
 namespace blink {
 
-namespace {
-
-WebPresentationClient* PresentationClient(ExecutionContext* execution_context) {
-  if (!execution_context)
-    return nullptr;
-  DCHECK(execution_context->IsDocument());
-  Document* document = ToDocument(execution_context);
-  if (!document->GetFrame())
-    return nullptr;
-  PresentationController* controller =
-      PresentationController::From(*document->GetFrame());
-  return controller ? controller->Client() : nullptr;
-}
-
-}  // anonymous namespace
-
 // static
 PresentationAvailability* PresentationAvailability::Take(
     PresentationAvailabilityProperty* resolver,
@@ -118,7 +102,8 @@ void PresentationAvailability::SetState(State state) {
 }
 
 void PresentationAvailability::UpdateListening() {
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (!client)
     return;
 

third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp

@@ -32,19 +32,6 @@ namespace blink {
 
 namespace {
 
-// TODO(mlamouri): refactor in one common place.
-WebPresentationClient* PresentationClient(ExecutionContext* execution_context) {
-  DCHECK(execution_context);
-  DCHECK(execution_context->IsDocument());
-
-  Document* document = ToDocument(execution_context);
-  if (!document->GetFrame())
-    return nullptr;
-  PresentationController* controller =
-      PresentationController::From(*document->GetFrame());
-  return controller ? controller->Client() : nullptr;
-}
-
 const AtomicString& ConnectionStateToString(
     WebPresentationConnectionState state) {
   DEFINE_STATIC_LOCAL(const AtomicString, connecting_value, ("connecting"));
@@ -311,11 +298,12 @@ bool PresentationConnection::CanSendMessage(ExceptionState& exception_state) {
   }
 
   // The connection can send a message if there is a client available.
-  return !!PresentationClient(GetExecutionContext());
+  return !!PresentationController::ClientFromContext(GetExecutionContext());
 }
 
 void PresentationConnection::HandleMessageQueue() {
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (!client || !proxy_)
     return;
 
@@ -402,7 +390,8 @@ void PresentationConnection::close() {
       state_ != WebPresentationConnectionState::kConnected) {
     return;
   }
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (client)
     client->CloseConnection(url_, id_, proxy_.get());
 
@@ -412,7 +401,8 @@ void PresentationConnection::close() {
 void PresentationConnection::terminate() {
   if (state_ != WebPresentationConnectionState::kConnected)
     return;
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (client)
     client->TerminatePresentation(url_, id_);
 
@@ -491,7 +481,8 @@ void PresentationConnection::DidFinishLoadingBlob(DOMArrayBuffer* buffer) {
   DCHECK(buffer);
   DCHECK(buffer->Buffer());
   // Send the loaded blob immediately here and continue processing the queue.
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (client) {
     client->SendBlobData(url_, id_, static_cast<const uint8_t*>(buffer->Data()),
                          buffer->ByteLength(), proxy_.get());

third_party/WebKit/Source/modules/presentation/PresentationController.cpp

@@ -59,6 +59,28 @@ WebPresentationClient* PresentationController::Client() {
   return client_;
 }
 
+// static
+PresentationController* PresentationController::FromContext(
+    ExecutionContext* execution_context) {
+  if (!execution_context)
+    return nullptr;
+
+  DCHECK(execution_context->IsDocument());
+  Document* document = ToDocument(execution_context);
+  if (!document->GetFrame())
+    return nullptr;
+
+  return PresentationController::From(*document->GetFrame());
+}
+
+// static
+WebPresentationClient* PresentationController::ClientFromContext(
+    ExecutionContext* execution_context) {
+  PresentationController* controller =
+      PresentationController::FromContext(execution_context);
+  return controller ? controller->Client() : nullptr;
+}
+
 DEFINE_TRACE(PresentationController) {
   visitor->Trace(presentation_);
   visitor->Trace(connections_);

third_party/WebKit/Source/modules/presentation/PresentationController.h

@@ -40,6 +40,8 @@ class MODULES_EXPORT PresentationController final
   static void ProvideTo(LocalFrame&, WebPresentationClient*);
 
   WebPresentationClient* Client();
+  static WebPresentationClient* ClientFromContext(ExecutionContext*);
+  static PresentationController* FromContext(ExecutionContext*);
 
   // Implementation of Supplement.
   DECLARE_VIRTUAL_TRACE();

third_party/WebKit/Source/modules/presentation/PresentationRequest.cpp

@@ -28,23 +28,6 @@ namespace blink {
 
 namespace {
 
-// TODO(mlamouri): refactor in one common place.
-PresentationController* GetPresentationController(
-    ExecutionContext* execution_context) {
-  DCHECK(execution_context);
-
-  Document* document = ToDocument(execution_context);
-  if (!document->GetFrame())
-    return nullptr;
-  return PresentationController::From(*document->GetFrame());
-}
-
-WebPresentationClient* PresentationClient(ExecutionContext* execution_context) {
-  PresentationController* controller =
-      GetPresentationController(execution_context);
-  return controller ? controller->Client() : nullptr;
-}
-
 Settings* GetSettings(ExecutionContext* execution_context) {
   DCHECK(execution_context);
 
@@ -143,7 +126,8 @@ ScriptPromise PresentationRequest::start(ScriptState* script_state) {
             kInvalidAccessError,
             "PresentationRequest::start() requires user gesture."));
 
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (!client)
     return ScriptPromise::RejectWithDOMException(
         script_state,
@@ -159,7 +143,8 @@ ScriptPromise PresentationRequest::start(ScriptState* script_state) {
 
 ScriptPromise PresentationRequest::reconnect(ScriptState* script_state,
                                              const String& id) {
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (!client)
     return ScriptPromise::RejectWithDOMException(
         script_state,
@@ -170,7 +155,7 @@ ScriptPromise PresentationRequest::reconnect(ScriptState* script_state,
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
 
   PresentationController* controller =
-      GetPresentationController(GetExecutionContext());
+      PresentationController::FromContext(GetExecutionContext());
   DCHECK(controller);
 
   PresentationConnection* existing_connection =
@@ -189,7 +174,8 @@ ScriptPromise PresentationRequest::reconnect(ScriptState* script_state,
 }
 
 ScriptPromise PresentationRequest::getAvailability(ScriptState* script_state) {
-  WebPresentationClient* client = PresentationClient(GetExecutionContext());
+  WebPresentationClient* client =
+      PresentationController::ClientFromContext(GetExecutionContext());
   if (!client)
     return ScriptPromise::RejectWithDOMException(
         script_state,