| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/geolocation/location_arbitrator.h" | 5 #include "chrome/browser/geolocation/location_arbitrator.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "chrome/browser/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 | 10 |
| 11 namespace { | 11 namespace { |
| 12 const char* kDefaultNetworkProviderUrl = "https://www.google.com/loc/json"; | 12 const char* kDefaultNetworkProviderUrl = "https://www.google.com/loc/json"; |
| 13 // TODO(joth): Remove this global function pointer and update all tests to use | 13 // TODO(joth): Remove this global function pointer and update all tests to use |
| 14 // an injected ProviderFactory class instead. | 14 // an injected ProviderFactory class instead. |
| 15 GeolocationArbitrator::LocationProviderFactoryFunction | 15 GeolocationArbitrator::LocationProviderFactoryFunction |
| 16 g_provider_factory_function_for_test = NULL; | 16 g_provider_factory_function_for_test = NULL; |
| 17 } // namespace | 17 } // namespace |
| 18 | 18 |
| 19 | 19 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 return most_recent_authorized_frame_.is_valid(); | 175 return most_recent_authorized_frame_.is_valid(); |
| 176 } | 176 } |
| 177 | 177 |
| 178 GeolocationArbitrator::ProviderFactory::~ProviderFactory() { | 178 GeolocationArbitrator::ProviderFactory::~ProviderFactory() { |
| 179 } | 179 } |
| 180 | 180 |
| 181 void GeolocationArbitrator::SetProviderFactoryForTest( | 181 void GeolocationArbitrator::SetProviderFactoryForTest( |
| 182 LocationProviderFactoryFunction factory_function) { | 182 LocationProviderFactoryFunction factory_function) { |
| 183 g_provider_factory_function_for_test = factory_function; | 183 g_provider_factory_function_for_test = factory_function; |
| 184 } | 184 } |
| OLD | NEW |