OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 9 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
10 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
11 #include "chrome/test/base/ui_test_utils.h" | |
12 #include "content/public/browser/access_token_store.h" | 11 #include "content/public/browser/access_token_store.h" |
13 #include "content/public/test/test_browser_thread.h" | 12 #include "content/public/test/test_browser_thread.h" |
| 13 #include "content/public/test/test_utils.h" |
14 | 14 |
15 using content::AccessTokenStore; | 15 using content::AccessTokenStore; |
16 using content::BrowserThread; | 16 using content::BrowserThread; |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 // The token store factory implementation expects to be used from any well-known | 20 // The token store factory implementation expects to be used from any well-known |
21 // chrome thread other than UI. We could use any arbitrary thread; IO is | 21 // chrome thread other than UI. We could use any arbitrary thread; IO is |
22 // a good choice as this is the expected usage. | 22 // a good choice as this is the expected usage. |
23 const BrowserThread::ID kExpectedClientThreadId = BrowserThread::IO; | 23 const BrowserThread::ID kExpectedClientThreadId = BrowserThread::IO; |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 // Set a token for the old default network provider url. | 129 // Set a token for the old default network provider url. |
130 DoTestStepAndWaitForResults(kOldDefaultNetworkProviderUrl, | 130 DoTestStepAndWaitForResults(kOldDefaultNetworkProviderUrl, |
131 NULL, &ref_token1); | 131 NULL, &ref_token1); |
132 // Check that the token related to the old default network provider url | 132 // Check that the token related to the old default network provider url |
133 // was deleted. | 133 // was deleted. |
134 DoTestStepAndWaitForResults(kOldDefaultNetworkProviderUrl, | 134 DoTestStepAndWaitForResults(kOldDefaultNetworkProviderUrl, |
135 NULL, NULL); | 135 NULL, NULL); |
136 } | 136 } |
137 | 137 |
138 } // namespace | 138 } // namespace |
OLD | NEW |