OLD | NEW |
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 "android_webview/browser/net/aw_cookie_store_wrapper.h" | 5 #include "android_webview/browser/net/aw_cookie_store_wrapper.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include <memory> |
| 8 |
8 #include "net/cookies/cookie_store.h" | 9 #include "net/cookies/cookie_store.h" |
9 #include "net/cookies/cookie_store_test_callbacks.h" | 10 #include "net/cookies/cookie_store_test_callbacks.h" |
10 #include "net/cookies/cookie_store_unittest.h" | 11 #include "net/cookies/cookie_store_unittest.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
12 | 13 |
13 namespace android_webview { | 14 namespace android_webview { |
14 | 15 |
15 struct AwCookieStoreWrapperTestTraits { | 16 struct AwCookieStoreWrapperTestTraits { |
16 static scoped_ptr<net::CookieStore> Create() { | 17 static std::unique_ptr<net::CookieStore> Create() { |
17 scoped_ptr<net::CookieStore> cookie_store(new AwCookieStoreWrapper()); | 18 std::unique_ptr<net::CookieStore> cookie_store(new AwCookieStoreWrapper()); |
18 | 19 |
19 // Android Webview can run multiple tests without restarting the binary, | 20 // Android Webview can run multiple tests without restarting the binary, |
20 // so have to delete any cookies the global store may have from an earlier | 21 // so have to delete any cookies the global store may have from an earlier |
21 // test. | 22 // test. |
22 net::ResultSavingCookieCallback<int> callback; | 23 net::ResultSavingCookieCallback<int> callback; |
23 cookie_store->DeleteAllAsync( | 24 cookie_store->DeleteAllAsync( |
24 base::Bind(&net::ResultSavingCookieCallback<int>::Run, | 25 base::Bind(&net::ResultSavingCookieCallback<int>::Run, |
25 base::Unretained(&callback))); | 26 base::Unretained(&callback))); |
26 callback.WaitUntilDone(); | 27 callback.WaitUntilDone(); |
27 | 28 |
(...skipping 11 matching lines...) Expand all Loading... |
39 | 40 |
40 } // namespace android_webview | 41 } // namespace android_webview |
41 | 42 |
42 // Run the standard cookie tests with AwCookieStoreWrapper. Macro must be in | 43 // Run the standard cookie tests with AwCookieStoreWrapper. Macro must be in |
43 // net namespace. | 44 // net namespace. |
44 namespace net { | 45 namespace net { |
45 INSTANTIATE_TYPED_TEST_CASE_P(AwCookieStoreWrapper, | 46 INSTANTIATE_TYPED_TEST_CASE_P(AwCookieStoreWrapper, |
46 CookieStoreTest, | 47 CookieStoreTest, |
47 android_webview::AwCookieStoreWrapperTestTraits); | 48 android_webview::AwCookieStoreWrapperTestTraits); |
48 } // namespace net | 49 } // namespace net |
OLD | NEW |