| 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 // This file defines a unit test for the profile's token service. | 5 // This file defines a unit test for the profile's token service. |
| 6 | 6 |
| 7 #include "chrome/browser/signin/token_service_unittest.h" | 7 #include "chrome/browser/signin/token_service_unittest.h" |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 // You have to destroy the profile before the db_thread_ stops. | 90 // You have to destroy the profile before the db_thread_ stops. |
| 91 if (profile_.get()) { | 91 if (profile_.get()) { |
| 92 profile_.reset(NULL); | 92 profile_.reset(NULL); |
| 93 } | 93 } |
| 94 // Schedule another task on the DB thread to notify us that it's safe to | 94 // Schedule another task on the DB thread to notify us that it's safe to |
| 95 // carry on with the test. | 95 // carry on with the test. |
| 96 base::WaitableEvent done(false, false); | 96 base::WaitableEvent done(false, false); |
| 97 BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, | 97 BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, |
| 98 base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done))); | 98 base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done))); |
| 99 done.Wait(); | 99 done.Wait(); |
| 100 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); | 100 base::MessageLoop::current()->PostTask(FROM_HERE, |
| 101 MessageLoop::current()->Run(); | 101 base::MessageLoop::QuitClosure()); |
| 102 base::MessageLoop::current()->Run(); |
| 102 db_thread_.Stop(); | 103 db_thread_.Stop(); |
| 103 } | 104 } |
| 104 | 105 |
| 105 void TokenServiceTestHarness::WaitForDBLoadCompletion() { | 106 void TokenServiceTestHarness::WaitForDBLoadCompletion() { |
| 106 // Force the loading of the WebDataService. | 107 // Force the loading of the WebDataService. |
| 107 TokenWebData::FromBrowserContext(profile_.get()); | 108 TokenWebData::FromBrowserContext(profile_.get()); |
| 108 | 109 |
| 109 // The WebDB does all work on the DB thread. This will add an event | 110 // The WebDB does all work on the DB thread. This will add an event |
| 110 // to the end of the DB thread, so when we reach this task, all DB | 111 // to the end of the DB thread, so when we reach this task, all DB |
| 111 // operations should be complete. | 112 // operations should be complete. |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 | 419 |
| 419 *CommandLine::ForCurrentProcess() = original_cl; | 420 *CommandLine::ForCurrentProcess() = original_cl; |
| 420 } | 421 } |
| 421 }; | 422 }; |
| 422 | 423 |
| 423 TEST_F(TokenServiceCommandLineTest, TestValueOverride) { | 424 TEST_F(TokenServiceCommandLineTest, TestValueOverride) { |
| 424 EXPECT_TRUE(service_->HasTokenForService("my_service")); | 425 EXPECT_TRUE(service_->HasTokenForService("my_service")); |
| 425 EXPECT_EQ("my_value", service_->GetTokenForService("my_service")); | 426 EXPECT_EQ("my_value", service_->GetTokenForService("my_service")); |
| 426 } | 427 } |
| 427 #endif // ifndef NDEBUG | 428 #endif // ifndef NDEBUG |
| OLD | NEW |