| 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" | 10 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 WifiDataProviderManager::WifiDataUpdateCallback callback_; | 77 WifiDataProviderManager::WifiDataUpdateCallback callback_; |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 class WifiDataProviderCommonWithMock : public WifiDataProviderCommon { | 80 class WifiDataProviderCommonWithMock : public WifiDataProviderCommon { |
| 81 public: | 81 public: |
| 82 WifiDataProviderCommonWithMock() | 82 WifiDataProviderCommonWithMock() |
| 83 : new_wlan_api_(new MockWlanApi), | 83 : new_wlan_api_(new MockWlanApi), |
| 84 new_polling_policy_(new MockPollingPolicy) {} | 84 new_polling_policy_(new MockPollingPolicy) {} |
| 85 | 85 |
| 86 // WifiDataProviderCommon | 86 // WifiDataProviderCommon |
| 87 virtual WlanApiInterface* NewWlanApi() OVERRIDE { | 87 virtual WlanApiInterface* NewWlanApi() override { |
| 88 CHECK(new_wlan_api_ != NULL); | 88 CHECK(new_wlan_api_ != NULL); |
| 89 return new_wlan_api_.release(); | 89 return new_wlan_api_.release(); |
| 90 } | 90 } |
| 91 virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE { | 91 virtual WifiPollingPolicy* NewPollingPolicy() override { |
| 92 CHECK(new_polling_policy_ != NULL); | 92 CHECK(new_polling_policy_ != NULL); |
| 93 return new_polling_policy_.release(); | 93 return new_polling_policy_.release(); |
| 94 } | 94 } |
| 95 | 95 |
| 96 scoped_ptr<MockWlanApi> new_wlan_api_; | 96 scoped_ptr<MockWlanApi> new_wlan_api_; |
| 97 scoped_ptr<MockPollingPolicy> new_polling_policy_; | 97 scoped_ptr<MockPollingPolicy> new_polling_policy_; |
| 98 | 98 |
| 99 private: | 99 private: |
| 100 virtual ~WifiDataProviderCommonWithMock() {} | 100 virtual ~WifiDataProviderCommonWithMock() {} |
| 101 | 101 |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 MessageLoopQuitter loop_quitter(&main_message_loop_); | 231 MessageLoopQuitter loop_quitter(&main_message_loop_); |
| 232 WifiDataProviderManager::SetFactoryForTesting( | 232 WifiDataProviderManager::SetFactoryForTesting( |
| 233 CreateWifiDataProviderCommonWithMock); | 233 CreateWifiDataProviderCommonWithMock); |
| 234 WifiDataProviderManager::Register(&loop_quitter.callback_); | 234 WifiDataProviderManager::Register(&loop_quitter.callback_); |
| 235 main_message_loop_.Run(); | 235 main_message_loop_.Run(); |
| 236 WifiDataProviderManager::Unregister(&loop_quitter.callback_); | 236 WifiDataProviderManager::Unregister(&loop_quitter.callback_); |
| 237 WifiDataProviderManager::ResetFactoryForTesting(); | 237 WifiDataProviderManager::ResetFactoryForTesting(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 } // namespace content | 240 } // namespace content |
| OLD | NEW |