Revert of Work around a clang-cl devirtualization bug.

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

 // 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.
 
 #ifndef PaymentRequest_h
 #define PaymentRequest_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/ScriptWrappable.h"
@@ skipping 13 matching lines @@
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class ExceptionState;
 class ScriptPromiseResolver;
 class ScriptState;
 class ShippingAddress;
 
-// TODO(thakis): Make this class final again once https://crbug.com/608705 is fixed.
-class MODULES_EXPORT PaymentRequest /* final */ : public EventTargetWithInlineData, WTF_NON_EXPORTED_BASE(public mojom::blink::PaymentRequestClient), public PaymentCompleter, public PaymentUpdater, public ContextLifecycleObserver {
+class MODULES_EXPORT PaymentRequest final : public EventTargetWithInlineData, WTF_NON_EXPORTED_BASE(public mojom::blink::PaymentRequestClient), public PaymentCompleter, public PaymentUpdater, public ContextLifecycleObserver {
     DEFINE_WRAPPERTYPEINFO();
     USING_GARBAGE_COLLECTED_MIXIN(PaymentRequest)
     WTF_MAKE_NONCOPYABLE(PaymentRequest);
 
 public:
     static PaymentRequest* create(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, ExceptionState&);
     static PaymentRequest* create(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, const PaymentOptions&, ExceptionState&);
     static PaymentRequest* create(ScriptState*, const Vector<String>& supportedMethods, const PaymentDetails&, const PaymentOptions&, const ScriptValue& data, ExceptionState&);
 
     virtual ~PaymentRequest();
@@ skipping 43 matching lines @@
     String m_shippingOption;
     Member<ScriptPromiseResolver> m_showResolver;
     Member<ScriptPromiseResolver> m_completeResolver;
     mojom::blink::PaymentRequestPtr m_paymentProvider;
     mojo::Binding<mojom::blink::PaymentRequestClient> m_clientBinding;
 };
 
 } // namespace blink
 
 #endif // PaymentRequest_h