[Presentation API] Use connection proxy to change connection state to 'closed'

content/renderer/presentation/presentation_connection_proxy.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/presentation/presentation_connection_proxy.h"
 
 #include "base/logging.h"
 #include "content/public/common/presentation_session.h"
 #include "content/renderer/presentation/presentation_dispatcher.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ skipping 45 matching lines @@
     }
   }
 
   callback.Run(true);
 }
 
 // TODO(crbug.com/588874): Ensure legal PresentationConnection state transitions
 // in a single place.
 void PresentationConnectionProxy::DidChangeState(
     content::PresentationConnectionState state) {
-  if (state != content::PRESENTATION_CONNECTION_STATE_CONNECTED) {
-    // |DidChangeState| should only handle state transition from connecting ->
-    // connected. PresentationService and MRP handles other state transitions.
+  if (state == content::PRESENTATION_CONNECTION_STATE_CONNECTED) {
+    source_connection_->didChangeState(
+        blink::WebPresentationConnectionState::Connected);

[dcheng, 2017/03/02 07:31:07]

Kind of feels like it'd be easier to just pass in the Blink type as the
argument, and then pass that through. That doesn't have to be done in this CL
though.

[zhaobin, 2017/03/02 21:52:20]

Created crbug.com/698000.

+  } else if (state == content::PRESENTATION_CONNECTION_STATE_CLOSED) {
+    source_connection_->didChangeState(
+        blink::WebPresentationConnectionState::Closed);
+  } else {
     NOTREACHED();
-    return;
   }
+}
 
+void PresentationConnectionProxy::OnClose() {
+  DCHECK(target_connection_ptr_);
   source_connection_->didChangeState(
-      blink::WebPresentationConnectionState::Connected);
+      blink::WebPresentationConnectionState::Closed);
+  target_connection_ptr_->DidChangeState(
+      content::PRESENTATION_CONNECTION_STATE_CLOSED);
+}
+
+void PresentationConnectionProxy::close() const {
+  DCHECK(target_connection_ptr_);
+  target_connection_ptr_->OnClose();
 }
 
 ControllerConnectionProxy::ControllerConnectionProxy(
     blink::WebPresentationConnection* controller_connection)
     : PresentationConnectionProxy(controller_connection) {}
 
 ControllerConnectionProxy::~ControllerConnectionProxy() = default;
 
 blink::mojom::PresentationConnectionPtr ControllerConnectionProxy::Bind() {
   return binding_.CreateInterfacePtrAndBind();
@@ skipping 21 matching lines @@
     blink::mojom::PresentationConnectionPtr controller_connection_ptr) {
   DCHECK(!target_connection_ptr_);
   target_connection_ptr_ = std::move(controller_connection_ptr);
   target_connection_ptr_->DidChangeState(
       content::PRESENTATION_CONNECTION_STATE_CONNECTED);
 
   DidChangeState(content::PRESENTATION_CONNECTION_STATE_CONNECTED);
 }
 
 }  // namespace content