[PresentationAPI] Use KURL and WebURL in place of string types.

content/renderer/presentation/presentation_dispatcher.cc

 // Copyright 2015 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_dispatcher.h"
 
-#include <algorithm>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/presentation_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/renderer/presentation/presentation_connection_client.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationAvailabilityObserver.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationController.h"
 #include "third_party/WebKit/public/platform/modules/presentation/WebPresentationError.h"
 #include "third_party/WebKit/public/platform/modules/presentation/presentation.mojom.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "url/gurl.h"
 
 namespace {
 
@@ skipping 64 matching lines @@
     blink::WebPresentationController* controller) {
   // There shouldn't be any swapping from one non-null controller to another.
   DCHECK(controller != controller_ && (!controller || !controller_));
   controller_ = controller;
   // The controller is set to null when the frame is about to be detached.
   // Nothing is listening for screen availability anymore but the Mojo service
   // will know about the frame being detached anyway.
 }
 
 void PresentationDispatcher::startSession(
-    const blink::WebVector<blink::WebString>& presentationUrls,
+    const blink::WebVector<blink::WebURL>& presentationUrls,
     blink::WebPresentationConnectionClientCallbacks* callback) {
   DCHECK(callback);
   ConnectToPresentationServiceIfNeeded();
 
-  std::vector<GURL> urls(presentationUrls.size());
-  std::transform(presentationUrls.begin(), presentationUrls.end(), urls.begin(),
-                 [](const blink::WebString& url) { return GURL(url.utf8()); });
+  std::vector<GURL> urls;
+  for (const auto& url : presentationUrls)
+    urls.push_back(url);
 
   // The dispatcher owns the service so |this| will be valid when
   // OnSessionCreated() is called. |callback| needs to be alive and also needs
   // to be destroyed so we transfer its ownership to the mojo callback.
   presentation_service_->StartSession(
       urls, base::Bind(&PresentationDispatcher::OnSessionCreated,
                        base::Unretained(this), base::Owned(callback)));
 }
 
 void PresentationDispatcher::joinSession(
-    const blink::WebVector<blink::WebString>& presentationUrls,
+    const blink::WebVector<blink::WebURL>& presentationUrls,
     const blink::WebString& presentationId,
     blink::WebPresentationConnectionClientCallbacks* callback) {
   DCHECK(callback);
   ConnectToPresentationServiceIfNeeded();
 
-  std::vector<GURL> urls(presentationUrls.size());
-  std::transform(presentationUrls.begin(), presentationUrls.end(), urls.begin(),
-                 [](const blink::WebString& url) { return GURL(url.utf8()); });
+  std::vector<GURL> urls;
+  for (const auto& url : presentationUrls)
+    urls.push_back(url);
 
   // The dispatcher owns the service so |this| will be valid when
   // OnSessionCreated() is called. |callback| needs to be alive and also needs
   // to be destroyed so we transfer its ownership to the mojo callback.
   presentation_service_->JoinSession(
       urls, presentationId.utf8(),
       base::Bind(&PresentationDispatcher::OnSessionCreated,
                  base::Unretained(this), base::Owned(callback)));
 }
 
-void PresentationDispatcher::sendString(
-    const blink::WebString& presentationUrl,
-    const blink::WebString& presentationId,
-    const blink::WebString& message) {
+void PresentationDispatcher::sendString(const blink::WebURL& presentationUrl,
+                                        const blink::WebString& presentationId,
+                                        const blink::WebString& message) {
   if (message.utf8().size() > kMaxPresentationSessionMessageSize) {
     // TODO(crbug.com/459008): Limit the size of individual messages to 64k
     // for now. Consider throwing DOMException or splitting bigger messages
     // into smaller chunks later.
     LOG(WARNING) << "message size exceeded limit!";
     return;
   }
 
   message_request_queue_.push(base::WrapUnique(
       CreateSendTextMessageRequest(presentationUrl, presentationId, message)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::sendArrayBuffer(
-    const blink::WebString& presentationUrl,
+    const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const uint8_t* data,
     size_t length) {
   DCHECK(data);
   if (length > kMaxPresentationSessionMessageSize) {
     // TODO(crbug.com/459008): Same as in sendString().
     LOG(WARNING) << "data size exceeded limit!";
     return;
   }
 
   message_request_queue_.push(base::WrapUnique(CreateSendBinaryMessageRequest(
       presentationUrl, presentationId,
       blink::mojom::PresentationMessageType::ARRAY_BUFFER, data, length)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::sendBlobData(
-    const blink::WebString& presentationUrl,
+    const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const uint8_t* data,
     size_t length) {
   DCHECK(data);
   if (length > kMaxPresentationSessionMessageSize) {
     // TODO(crbug.com/459008): Same as in sendString().
     LOG(WARNING) << "data size exceeded limit!";
     return;
   }
 
@@ skipping 29 matching lines @@
     return;
   }
 
   message_request_queue_.pop();
   if (!message_request_queue_.empty()) {
     DoSendMessage(message_request_queue_.front().get());
   }
 }
 
 void PresentationDispatcher::closeSession(
-    const blink::WebString& presentationUrl,
+    const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
   ConnectToPresentationServiceIfNeeded();
-  presentation_service_->CloseConnection(GURL(presentationUrl.utf8()),
+  presentation_service_->CloseConnection(presentationUrl,
                                          presentationId.utf8());
 }
 
 void PresentationDispatcher::terminateSession(
-    const blink::WebString& presentationUrl,
+    const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
   ConnectToPresentationServiceIfNeeded();
-  presentation_service_->Terminate(GURL(presentationUrl.utf8()),
-                                   presentationId.utf8());
+  presentation_service_->Terminate(presentationUrl, presentationId.utf8());
 }
 
 void PresentationDispatcher::getAvailability(
-    const blink::WebString& availabilityUrl,
+    const blink::WebURL& availabilityUrl,
     blink::WebPresentationAvailabilityCallbacks* callbacks) {
-  const std::string& availability_url = availabilityUrl.utf8();
   AvailabilityStatus* status = nullptr;
-  auto status_it = availability_status_.find(availability_url);
+  auto status_it = availability_status_.find(availabilityUrl);
   if (status_it == availability_status_.end()) {
-    status = new AvailabilityStatus(availability_url);
-    availability_status_[availability_url] = base::WrapUnique(status);
+    status = new AvailabilityStatus(availabilityUrl);
+    availability_status_[availabilityUrl] = base::WrapUnique(status);
   } else {
     status = status_it->second.get();
   }
   DCHECK(status);
 
   if (status->listening_state == ListeningState::ACTIVE) {
     callbacks->onSuccess(status->last_known_availability);
     delete callbacks;
     return;
   }
 
   status->availability_callbacks.Add(callbacks);
   UpdateListeningState(status);
 }
 
 void PresentationDispatcher::startListening(
     blink::WebPresentationAvailabilityObserver* observer) {
-  const std::string& availability_url = observer->url().string().utf8();
-  auto status_it = availability_status_.find(availability_url);
+  auto status_it = availability_status_.find(observer->url());
   if (status_it == availability_status_.end()) {
     DLOG(WARNING) << "Start listening for availability for unknown URL "
-                  << availability_url;
+                  << observer->url();
     return;
   }
   status_it->second->availability_observers.insert(observer);
   UpdateListeningState(status_it->second.get());
 }
 
 void PresentationDispatcher::stopListening(
     blink::WebPresentationAvailabilityObserver* observer) {
-  const std::string& availability_url = observer->url().string().utf8();
-  auto status_it = availability_status_.find(availability_url);
+  auto status_it = availability_status_.find(observer->url());
   if (status_it == availability_status_.end()) {
     DLOG(WARNING) << "Stop listening for availability for unknown URL "
-                  << availability_url;
+                  << observer->url();
     return;
   }
   status_it->second->availability_observers.erase(observer);
   UpdateListeningState(status_it->second.get());
 }
 
 void PresentationDispatcher::setDefaultPresentationUrls(
-    const blink::WebVector<blink::WebString>& presentationUrls) {
+    const blink::WebVector<blink::WebURL>& presentationUrls) {
   ConnectToPresentationServiceIfNeeded();
 
-  std::vector<GURL> urls(presentationUrls.size());
-  std::transform(presentationUrls.begin(), presentationUrls.end(), urls.begin(),
-                 [](const blink::WebString& url) { return GURL(url.utf8()); });
+  std::vector<GURL> urls;
+  for (const auto& url : presentationUrls)
+    urls.push_back(url);
+
   presentation_service_->SetDefaultPresentationUrls(urls);
 }
 
 void PresentationDispatcher::DidCommitProvisionalLoad(
     bool is_new_navigation,
     bool is_same_page_navigation) {
   blink::WebFrame* frame = render_frame()->GetWebFrame();
   // If not top-level navigation.
   if (frame->parent() || is_same_page_navigation)
     return;
 
   // Remove all pending send message requests.
   MessageRequestQueue empty;
   std::swap(message_request_queue_, empty);
 }
 
 void PresentationDispatcher::OnDestruct() {
   delete this;
 }
 
 void PresentationDispatcher::OnScreenAvailabilityUpdated(const GURL& url,
                                                          bool available) {
-  auto status_it = availability_status_.find(url.spec());
+  auto status_it = availability_status_.find(url);
   if (status_it == availability_status_.end())
     return;
   AvailabilityStatus* status = status_it->second.get();
   DCHECK(status);
 
   if (status->listening_state == ListeningState::WAITING)
     status->listening_state = ListeningState::ACTIVE;
 
   for (auto* observer : status->availability_observers)
     observer->availabilityChanged(available);
 
   for (AvailabilityCallbacksMap::iterator iter(&status->availability_callbacks);
        !iter.IsAtEnd(); iter.Advance()) {
     iter.GetCurrentValue()->onSuccess(available);
   }
   status->last_known_availability = available;
   status->availability_callbacks.Clear();
   UpdateListeningState(status);
 }
 
 void PresentationDispatcher::OnScreenAvailabilityNotSupported(const GURL& url) {
-  auto status_it = availability_status_.find(url.spec());
+  auto status_it = availability_status_.find(url);
   if (status_it == availability_status_.end())
     return;
   AvailabilityStatus* status = status_it->second.get();
   DCHECK(status);
   DCHECK(status->listening_state == ListeningState::WAITING);
 
   const blink::WebString& not_supported_error = blink::WebString::fromUTF8(
       "getAvailability() isn't supported at the moment. It can be due to "
       "a permanent or temporary system limitation. It is recommended to "
       "try to blindly start a session in that case.");
@@ skipping 111 matching lines @@
   bool should_listen = !status->availability_callbacks.IsEmpty() ||
                        !status->availability_observers.empty();
   bool is_listening = status->listening_state != ListeningState::INACTIVE;
 
   if (should_listen == is_listening)
     return;
 
   ConnectToPresentationServiceIfNeeded();
   if (should_listen) {
     status->listening_state = ListeningState::WAITING;
-    presentation_service_->ListenForScreenAvailability(GURL(status->url));
+    presentation_service_->ListenForScreenAvailability(status->url);
   } else {
     status->listening_state = ListeningState::INACTIVE;
-    presentation_service_->StopListeningForScreenAvailability(
-        GURL(status->url));
+    presentation_service_->StopListeningForScreenAvailability(status->url);
   }
 }
 
 PresentationDispatcher::SendMessageRequest::SendMessageRequest(
     blink::mojom::PresentationSessionInfoPtr session_info,
     blink::mojom::SessionMessagePtr message)
     : session_info(std::move(session_info)), message(std::move(message)) {}
 
 PresentationDispatcher::SendMessageRequest::~SendMessageRequest() {}
 
 // static
 PresentationDispatcher::SendMessageRequest*
 PresentationDispatcher::CreateSendTextMessageRequest(
-    const blink::WebString& presentationUrl,
+    const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     const blink::WebString& message) {
   blink::mojom::PresentationSessionInfoPtr session_info =
       blink::mojom::PresentationSessionInfo::New();
-  session_info->url = GURL(presentationUrl.utf8());
+  session_info->url = presentationUrl;
+  //  session_info->url = GURL(presentationUrl.utf8());

[imcheng, 2016/09/14 00:39:13]

rm this line

[mark a. foltz, 2016/09/14 20:02:42]

Done.

[mark a. foltz, 2016/09/14 20:02:42]

Done.

   session_info->id = presentationId.utf8();
 
   blink::mojom::SessionMessagePtr session_message =
       blink::mojom::SessionMessage::New();
   session_message->type = blink::mojom::PresentationMessageType::TEXT;
   session_message->message = message.utf8();
   return new SendMessageRequest(std::move(session_info),
                                 std::move(session_message));
 }
 
 // static
 PresentationDispatcher::SendMessageRequest*
 PresentationDispatcher::CreateSendBinaryMessageRequest(
-    const blink::WebString& presentationUrl,
+    const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId,
     blink::mojom::PresentationMessageType type,
     const uint8_t* data,
     size_t length) {
   blink::mojom::PresentationSessionInfoPtr session_info =
       blink::mojom::PresentationSessionInfo::New();
-  session_info->url = GURL(presentationUrl.utf8());
+  session_info->url = presentationUrl;
+  //  session_info->url = GURL(presentationUrl.utf8());

[imcheng, 2016/09/14 00:39:14]

ditto

[mark a. foltz, 2016/09/14 20:02:42]

Done.

   session_info->id = presentationId.utf8();
 
   blink::mojom::SessionMessagePtr session_message =
       blink::mojom::SessionMessage::New();
   session_message->type = type;
   session_message->data = std::vector<uint8_t>(data, data + length);
   return new SendMessageRequest(std::move(session_info),
                                 std::move(session_message));
 }
 
 PresentationDispatcher::AvailabilityStatus::AvailabilityStatus(
-    const std::string& availability_url)
+    const GURL& availability_url)
     : url(availability_url),
       last_known_availability(false),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::AvailabilityStatus::~AvailabilityStatus() {
 }
 
 }  // namespace content