Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/autofill/content/browser/risk/fingerprint.h" | 5 #include "components/autofill/content/browser/risk/fingerprint.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 177 const gfx::Rect window_bounds_; | 177 const gfx::Rect window_bounds_; |
| 178 const gfx::Rect content_bounds_; | 178 const gfx::Rect content_bounds_; |
| 179 const gfx::Rect screen_bounds_; | 179 const gfx::Rect screen_bounds_; |
| 180 const gfx::Rect available_screen_bounds_; | 180 const gfx::Rect available_screen_bounds_; |
| 181 const gfx::Rect unavailable_screen_bounds_; | 181 const gfx::Rect unavailable_screen_bounds_; |
| 182 | 182 |
| 183 // A message loop to block on the asynchronous loading of the fingerprint. | 183 // A message loop to block on the asynchronous loading of the fingerprint. |
| 184 base::MessageLoopForUI message_loop_; | 184 base::MessageLoopForUI message_loop_; |
| 185 }; | 185 }; |
| 186 | 186 |
| 187 #if defined(OS_WIN) | |
| 188 // http://crbug.com/503821 | |
| 189 #define MAYBE_GetFingerprint DISABLED_GetFingerprint | |
| 190 #else | |
| 191 #define MAYBE_GetFingerprint GetFingerprint | |
| 192 #endif | |
|
piman
2016/06/27 15:06:44
Is this change related to the issue at hand?
kirr
2016/06/27 15:28:52
I think this test should also be fixed by commit.
| |
| 193 | |
| 194 // Test that getting a fingerprint works on some basic level. | 187 // Test that getting a fingerprint works on some basic level. |
| 195 IN_PROC_BROWSER_TEST_F(AutofillRiskFingerprintTest, MAYBE_GetFingerprint) { | 188 IN_PROC_BROWSER_TEST_F(AutofillRiskFingerprintTest, GetFingerprint) { |
| 196 content::Geoposition position; | 189 content::Geoposition position; |
| 197 position.latitude = kLatitude; | 190 position.latitude = kLatitude; |
| 198 position.longitude = kLongitude; | 191 position.longitude = kLongitude; |
| 199 position.altitude = kAltitude; | 192 position.altitude = kAltitude; |
| 200 position.accuracy = kAccuracy; | 193 position.accuracy = kAccuracy; |
| 201 position.timestamp = | 194 position.timestamp = |
| 202 base::Time::UnixEpoch() + | 195 base::Time::UnixEpoch() + |
| 203 base::TimeDelta::FromMilliseconds(kGeolocationTime); | 196 base::TimeDelta::FromMilliseconds(kGeolocationTime); |
| 204 content::GeolocationProvider::GetInstance()->OverrideLocationForTesting( | 197 content::GeolocationProvider::GetInstance()->OverrideLocationForTesting( |
| 205 position); | 198 position); |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 216 base::TimeDelta::FromDays(1), // Ought to be longer than any test run. | 209 base::TimeDelta::FromDays(1), // Ought to be longer than any test run. |
| 217 base::Bind(&AutofillRiskFingerprintTest::GetFingerprintTestCallback, | 210 base::Bind(&AutofillRiskFingerprintTest::GetFingerprintTestCallback, |
| 218 base::Unretained(this))); | 211 base::Unretained(this))); |
| 219 | 212 |
| 220 // Wait for the callback to be called. | 213 // Wait for the callback to be called. |
| 221 message_loop_.Run(); | 214 message_loop_.Run(); |
| 222 } | 215 } |
| 223 | 216 |
| 224 } // namespace risk | 217 } // namespace risk |
| 225 } // namespace autofill | 218 } // namespace autofill |
| OLD | NEW |