| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <map> | 6 #include <map> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 | 232 |
| 233 class NativeBackendKWalletTest : public NativeBackendKWalletTestBase { | 233 class NativeBackendKWalletTest : public NativeBackendKWalletTestBase { |
| 234 protected: | 234 protected: |
| 235 NativeBackendKWalletTest() | 235 NativeBackendKWalletTest() |
| 236 : ui_thread_(BrowserThread::UI, &message_loop_), | 236 : ui_thread_(BrowserThread::UI, &message_loop_), |
| 237 db_thread_(BrowserThread::DB), klauncher_ret_(0), | 237 db_thread_(BrowserThread::DB), klauncher_ret_(0), |
| 238 klauncher_contacted_(false), kwallet_runnable_(true), | 238 klauncher_contacted_(false), kwallet_runnable_(true), |
| 239 kwallet_running_(true), kwallet_enabled_(true) { | 239 kwallet_running_(true), kwallet_enabled_(true) { |
| 240 } | 240 } |
| 241 | 241 |
| 242 virtual void SetUp(); | 242 void SetUp() override; |
| 243 virtual void TearDown(); | 243 void TearDown() override; |
| 244 | 244 |
| 245 // Let the DB thread run to completion of all current tasks. | 245 // Let the DB thread run to completion of all current tasks. |
| 246 void RunDBThread() { | 246 void RunDBThread() { |
| 247 base::WaitableEvent event(false, false); | 247 base::WaitableEvent event(false, false); |
| 248 BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, | 248 BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
| 249 base::Bind(ThreadDone, &event)); | 249 base::Bind(ThreadDone, &event)); |
| 250 event.Wait(); | 250 event.Wait(); |
| 251 // Some of the tests may post messages to the UI thread, but we don't need | 251 // Some of the tests may post messages to the UI thread, but we don't need |
| 252 // to run those until after the DB thread is finished. So run it here. | 252 // to run those until after the DB thread is finished. So run it here. |
| 253 message_loop_.RunUntilIdle(); | 253 message_loop_.RunUntilIdle(); |
| (...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1075 CheckVersion1Pickle(); | 1075 CheckVersion1Pickle(); |
| 1076 } | 1076 } |
| 1077 | 1077 |
| 1078 TEST_F(NativeBackendKWalletPickleTest, CheckVersion2Pickle) { | 1078 TEST_F(NativeBackendKWalletPickleTest, CheckVersion2Pickle) { |
| 1079 CheckVersion2Pickle(); | 1079 CheckVersion2Pickle(); |
| 1080 } | 1080 } |
| 1081 | 1081 |
| 1082 TEST_F(NativeBackendKWalletPickleTest, CheckVersion3Pickle) { | 1082 TEST_F(NativeBackendKWalletPickleTest, CheckVersion3Pickle) { |
| 1083 CheckVersion3Pickle(); | 1083 CheckVersion3Pickle(); |
| 1084 } | 1084 } |
| OLD | NEW |