Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1183)

Side by Side Diff: third_party/WebKit/Source/modules/payments/PaymentResponseTest.cpp

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/payments/PaymentResponse.h" 5 #include "modules/payments/PaymentResponse.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include "bindings/core/v8/ExceptionState.h" 9 #include "bindings/core/v8/ExceptionState.h"
10 #include "bindings/core/v8/ScriptValue.h" 10 #include "bindings/core/v8/ScriptValue.h"
(...skipping 10 matching lines...) Expand all
21 namespace { 21 namespace {
22 22
23 class MockPaymentCompleter 23 class MockPaymentCompleter
24 : public GarbageCollectedFinalized<MockPaymentCompleter>, 24 : public GarbageCollectedFinalized<MockPaymentCompleter>,
25 public PaymentCompleter { 25 public PaymentCompleter {
26 USING_GARBAGE_COLLECTED_MIXIN(MockPaymentCompleter); 26 USING_GARBAGE_COLLECTED_MIXIN(MockPaymentCompleter);
27 WTF_MAKE_NONCOPYABLE(MockPaymentCompleter); 27 WTF_MAKE_NONCOPYABLE(MockPaymentCompleter);
28 28
29 public: 29 public:
30 MockPaymentCompleter() { 30 MockPaymentCompleter() {
31 ON_CALL(*this, Complete(testing::_, testing::_)) 31 ON_CALL(*this, Complete(::testing::_, ::testing::_))
32 .WillByDefault(testing::ReturnPointee(&dummy_promise_)); 32 .WillByDefault(::testing::ReturnPointee(&dummy_promise_));
33 } 33 }
34 34
35 ~MockPaymentCompleter() override {} 35 ~MockPaymentCompleter() override {}
36 36
37 MOCK_METHOD2(Complete, ScriptPromise(ScriptState*, PaymentComplete result)); 37 MOCK_METHOD2(Complete, ScriptPromise(ScriptState*, PaymentComplete result));
38 38
39 DEFINE_INLINE_TRACE() {} 39 DEFINE_INLINE_TRACE() {}
40 40
41 private: 41 private:
42 ScriptPromise dummy_promise_; 42 ScriptPromise dummy_promise_;
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 "Latn\"," 164 "Latn\","
165 "\"organization\":\"\",\"recipient\":\"\",\"phone\":\"\"}," 165 "\"organization\":\"\",\"recipient\":\"\",\"phone\":\"\"},"
166 "\"shippingOption\":" 166 "\"shippingOption\":"
167 "\"standardShippingOption\",\"payerName\":\"Jon Doe\"," 167 "\"standardShippingOption\",\"payerName\":\"Jon Doe\","
168 "\"payerEmail\":\"abc@gmail.com\",\"payerPhone\":\"0123\"}"; 168 "\"payerEmail\":\"abc@gmail.com\",\"payerPhone\":\"0123\"}";
169 EXPECT_EQ(expected, json_string); 169 EXPECT_EQ(expected, json_string);
170 } 170 }
171 171
172 } // namespace 172 } // namespace
173 } // namespace blink 173 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698