[Presentation API] Add layout test for connection.close() and fix test failures

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 49 matching lines @@
 }
 
 // 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) {
     source_connection_->didChangeState(
         blink::WebPresentationConnectionState::Connected);
   } else if (state == content::PRESENTATION_CONNECTION_STATE_CLOSED) {
-    source_connection_->didChangeState(
-        blink::WebPresentationConnectionState::Closed);
+    source_connection_->didClose(
+        blink::WebPresentationConnectionCloseReason::Closed, "");
   } else {
     NOTREACHED();
   }
 }
 
 void PresentationConnectionProxy::OnClose() {
   DCHECK(target_connection_ptr_);
-  source_connection_->didChangeState(
-      blink::WebPresentationConnectionState::Closed);
+  source_connection_->didClose(
+      blink::WebPresentationConnectionCloseReason::Closed, "");
   target_connection_ptr_->DidChangeState(

[mark a. foltz, 2017/03/06 18:57:55]

Part of the connection refactoring should better align the Web* and the mojo
APIs for PresentationConnection.   For example, this could be
target_connection_ptr_->DidClose().

Not asking for changes here- I'm starting a design doc with some initial
thoughts and will share it post-perf :)

[zhaobin, 2017/03/06 19:52:23]

Acknowledged.

       content::PRESENTATION_CONNECTION_STATE_CLOSED);
 }
 
 void PresentationConnectionProxy::close() const {
   DCHECK(target_connection_ptr_);
   target_connection_ptr_->OnClose();
 }
 
 ControllerConnectionProxy::ControllerConnectionProxy(
     blink::WebPresentationConnection* controller_connection)
@@ skipping 27 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