Web Share: Refactor Mojo interface to now return an enum error.

third_party/WebKit/Source/modules/webshare/NavigatorShare.cpp

 // Copyright 2016 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 "modules/webshare/NavigatorShare.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "modules/webshare/ShareData.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
+namespace {
+
+// Gets the human-friendly error message for a ShareError. |error| must not be
+// ShareError::OK.
+String errorToString(mojom::blink::ShareError error) {
+  switch (error) {
+    case mojom::blink::ShareError::OK:
+      NOTREACHED();
+      break;
+    case mojom::blink::ShareError::INTERNAL_ERROR:
+      return "Share failed";
+    case mojom::blink::ShareError::CANCELED:
+      return "Share canceled";
+    case mojom::blink::ShareError::INVALID_TEMPLATE:
+      return "The target's url_template was invalid";
+  }
+  NOTREACHED();
+  return String();
+}
+
+}  // namespace
+
 class NavigatorShare::ShareClientImpl final
     : public GarbageCollected<ShareClientImpl> {
  public:
   ShareClientImpl(NavigatorShare*, ScriptPromiseResolver*);
 
-  void callback(const String& error);
+  void callback(mojom::blink::ShareError);
 
   void onConnectionError();
 
   DEFINE_INLINE_TRACE() {
     visitor->trace(m_navigator);
     visitor->trace(m_resolver);
   }
 
  private:
   WeakMember<NavigatorShare> m_navigator;
   Member<ScriptPromiseResolver> m_resolver;
 };
 
 NavigatorShare::ShareClientImpl::ShareClientImpl(
     NavigatorShare* navigator_share,
     ScriptPromiseResolver* resolver)
     : m_navigator(navigator_share), m_resolver(resolver) {}
 
-void NavigatorShare::ShareClientImpl::callback(const String& error) {
+void NavigatorShare::ShareClientImpl::callback(mojom::blink::ShareError error) {
   if (m_navigator)
     m_navigator->m_clients.erase(this);
 
-  if (error.isNull()) {
+  if (error == mojom::blink::ShareError::OK) {
     m_resolver->resolve();
   } else {
     // TODO(mgiuca): Work out which error type to use.

[Sam McNally, 2017/02/21 23:02:40]

Maybe it's time for this?

[Matt Giuca, 2017/02/23 04:18:37]

Hmm, it's kind of a spec issue. What types would you use?

-    m_resolver->reject(DOMException::create(AbortError, error));
+    m_resolver->reject(DOMException::create(AbortError, errorToString(error)));
   }
 }
 
 void NavigatorShare::ShareClientImpl::onConnectionError() {
   m_resolver->reject(
       DOMException::create(SecurityError, "WebShare is disabled."));
 }
 
 NavigatorShare::~NavigatorShare() = default;
 
@@ skipping 65 matching lines @@
 
 void NavigatorShare::onConnectionError() {
   for (auto& client : m_clients) {
     client->onConnectionError();
   }
   m_clients.clear();
   m_service.reset();
 }
 
 }  // namespace blink