Revert of [Web Payments] Mojom namespace blink -> payments

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

Index: third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
diff --git a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
index 6ce9aeb6f6529eb8772fc9e81a7a54c6b1885fca..44a9373fbbb401d6188579acaf0c3a692523ea3b 100644
--- a/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
+++ b/third_party/WebKit/Source/modules/payments/PaymentRequest.cpp
@@ -35,22 +35,22 @@
 
 namespace mojo {
 
-using payments::mojom::blink::PaymentCurrencyAmount;
-using payments::mojom::blink::PaymentCurrencyAmountPtr;
-using payments::mojom::blink::PaymentDetails;
-using payments::mojom::blink::PaymentDetailsModifier;
-using payments::mojom::blink::PaymentDetailsModifierPtr;
-using payments::mojom::blink::PaymentDetailsPtr;
-using payments::mojom::blink::PaymentErrorReason;
-using payments::mojom::blink::PaymentItem;
-using payments::mojom::blink::PaymentItemPtr;
-using payments::mojom::blink::PaymentMethodData;
-using payments::mojom::blink::PaymentMethodDataPtr;
-using payments::mojom::blink::PaymentOptions;
-using payments::mojom::blink::PaymentOptionsPtr;
-using payments::mojom::blink::PaymentShippingOption;
-using payments::mojom::blink::PaymentShippingOptionPtr;
-using payments::mojom::blink::PaymentShippingType;
+using blink::mojom::blink::PaymentCurrencyAmount;
+using blink::mojom::blink::PaymentCurrencyAmountPtr;
+using blink::mojom::blink::PaymentDetails;
+using blink::mojom::blink::PaymentDetailsModifier;
+using blink::mojom::blink::PaymentDetailsModifierPtr;
+using blink::mojom::blink::PaymentDetailsPtr;
+using blink::mojom::blink::PaymentErrorReason;
+using blink::mojom::blink::PaymentItem;
+using blink::mojom::blink::PaymentItemPtr;
+using blink::mojom::blink::PaymentMethodData;
+using blink::mojom::blink::PaymentMethodDataPtr;
+using blink::mojom::blink::PaymentOptions;
+using blink::mojom::blink::PaymentOptionsPtr;
+using blink::mojom::blink::PaymentShippingOption;
+using blink::mojom::blink::PaymentShippingOptionPtr;
+using blink::mojom::blink::PaymentShippingType;
 
 template <>
 struct TypeConverter<PaymentCurrencyAmountPtr, blink::PaymentCurrencyAmount> {
@@ -418,8 +418,8 @@
   return validValues[0];
 }
 
-payments::mojom::blink::PaymentDetailsPtr maybeKeepShippingOptions(
-    payments::mojom::blink::PaymentDetailsPtr details,
+mojom::blink::PaymentDetailsPtr maybeKeepShippingOptions(
+    mojom::blink::PaymentDetailsPtr details,
     bool keep) {
   if (!keep)
     details->shipping_options.resize(0);
@@ -455,13 +455,12 @@
   return false;
 }
 
-WTF::Vector<payments::mojom::blink::PaymentMethodDataPtr>
-ConvertPaymentMethodData(
+WTF::Vector<mojom::blink::PaymentMethodDataPtr> ConvertPaymentMethodData(
     const Vector<PaymentRequest::MethodData>& blinkMethods) {
-  WTF::Vector<payments::mojom::blink::PaymentMethodDataPtr> mojoMethods(
+  WTF::Vector<mojom::blink::PaymentMethodDataPtr> mojoMethods(
       blinkMethods.size());
   for (size_t i = 0; i < blinkMethods.size(); ++i) {
-    mojoMethods[i] = payments::mojom::blink::PaymentMethodData::New();
+    mojoMethods[i] = mojom::blink::PaymentMethodData::New();
     mojoMethods[i]->supported_methods =
         WTF::Vector<WTF::String>(blinkMethods[i].supportedMethods);
     mojoMethods[i]->stringified_data = blinkMethods[i].stringifiedData;
@@ -563,7 +562,7 @@
   m_completeTimer.stop();
 
   // The payment provider should respond in PaymentRequest::OnComplete().
-  m_paymentProvider->Complete(payments::mojom::blink::PaymentComplete(result));
+  m_paymentProvider->Complete(mojom::blink::PaymentComplete(result));
 
   m_completeResolver = ScriptPromiseResolver::create(scriptState);
   return m_completeResolver->promise();
@@ -602,8 +601,7 @@
   }
 
   m_paymentProvider->UpdateWith(maybeKeepShippingOptions(
-      payments::mojom::blink::PaymentDetails::From(details),
-      keepShippingOptions));
+      mojom::blink::PaymentDetails::From(details), keepShippingOptions));
 }
 
 void PaymentRequest::onUpdatePaymentDetailsFailure(const String& error) {
@@ -676,14 +674,14 @@
       mojo::GetProxy(&m_paymentProvider));
   m_paymentProvider.set_connection_error_handler(convertToBaseCallback(
       WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this),
-                payments::mojom::blink::PaymentErrorReason::UNKNOWN)));
+                mojom::blink::PaymentErrorReason::UNKNOWN)));
   m_paymentProvider->Init(
       m_clientBinding.CreateInterfacePtrAndBind(),
       ConvertPaymentMethodData(validatedMethodData),
       maybeKeepShippingOptions(
-          payments::mojom::blink::PaymentDetails::From(details),
+          mojom::blink::PaymentDetails::From(details),
           keepShippingOptions && m_options.requestShipping()),
-      payments::mojom::blink::PaymentOptions::From(m_options));
+      mojom::blink::PaymentOptions::From(m_options));
 }
 
 void PaymentRequest::contextDestroyed() {
@@ -691,7 +689,7 @@
 }
 
 void PaymentRequest::OnShippingAddressChange(
-    payments::mojom::blink::PaymentAddressPtr address) {
+    mojom::blink::PaymentAddressPtr address) {
   DCHECK(m_showResolver);
   DCHECK(!m_completeResolver);
 
@@ -726,7 +724,7 @@
 }
 
 void PaymentRequest::OnPaymentResponse(
-    payments::mojom::blink::PaymentResponsePtr response) {
+    mojom::blink::PaymentResponsePtr response) {
   DCHECK(m_showResolver);
   DCHECK(!m_completeResolver);
   DCHECK(!m_completeTimer.isActive());
@@ -788,15 +786,15 @@
   String message;
 
   switch (error) {
-    case payments::mojom::blink::PaymentErrorReason::USER_CANCEL:
+    case mojom::blink::PaymentErrorReason::USER_CANCEL:
       message = "Request cancelled";
       break;
-    case payments::mojom::blink::PaymentErrorReason::NOT_SUPPORTED:
+    case mojom::blink::PaymentErrorReason::NOT_SUPPORTED:
       isError = true;
       ec = NotSupportedError;
       message = "The payment method is not supported";
       break;
-    case payments::mojom::blink::PaymentErrorReason::UNKNOWN:
+    case mojom::blink::PaymentErrorReason::UNKNOWN:
       isError = true;
       ec = UnknownError;
       message = "Request failed";
@@ -850,7 +848,7 @@
 }
 
 void PaymentRequest::onCompleteTimeout(TimerBase*) {
-  m_paymentProvider->Complete(payments::mojom::blink::PaymentComplete(Fail));
+  m_paymentProvider->Complete(mojom::blink::PaymentComplete(Fail));
   clearResolversAndCloseMojoConnection();
 }