OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromeos/net/network_portal_detector_impl.h" |
| 6 |
5 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <memory> |
6 #include <vector> | 9 #include <vector> |
7 | 10 |
8 #include "base/command_line.h" | 11 #include "base/command_line.h" |
9 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
10 #include "base/logging.h" | 13 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "base/metrics/histogram_base.h" | 14 #include "base/metrics/histogram_base.h" |
13 #include "base/metrics/histogram_samples.h" | 15 #include "base/metrics/histogram_samples.h" |
14 #include "base/metrics/statistics_recorder.h" | 16 #include "base/metrics/statistics_recorder.h" |
15 #include "base/run_loop.h" | 17 #include "base/run_loop.h" |
16 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" | 18 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 19 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
18 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | |
19 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h" | 20 #include "chrome/browser/chromeos/net/network_portal_detector_test_utils.h" |
20 #include "chrome/test/base/testing_browser_process.h" | 21 #include "chrome/test/base/testing_browser_process.h" |
21 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
22 #include "chrome/test/base/testing_profile_manager.h" | 23 #include "chrome/test/base/testing_profile_manager.h" |
23 #include "chromeos/chromeos_switches.h" | 24 #include "chromeos/chromeos_switches.h" |
24 #include "chromeos/dbus/dbus_thread_manager.h" | 25 #include "chromeos/dbus/dbus_thread_manager.h" |
25 #include "chromeos/dbus/shill_device_client.h" | 26 #include "chromeos/dbus/shill_device_client.h" |
26 #include "chromeos/dbus/shill_service_client.h" | 27 #include "chromeos/dbus/shill_service_client.h" |
27 #include "chromeos/network/network_handler.h" | 28 #include "chromeos/network/network_handler.h" |
28 #include "chromeos/network/network_state.h" | 29 #include "chromeos/network/network_state.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 } | 258 } |
258 | 259 |
259 void SetDisconnected(const std::string& service_path) { | 260 void SetDisconnected(const std::string& service_path) { |
260 DBusThreadManager::Get()->GetShillServiceClient()->Disconnect( | 261 DBusThreadManager::Get()->GetShillServiceClient()->Disconnect( |
261 dbus::ObjectPath(service_path), | 262 dbus::ObjectPath(service_path), |
262 base::Bind(&*base::DoNothing), | 263 base::Bind(&*base::DoNothing), |
263 base::Bind(&ErrorCallbackFunction)); | 264 base::Bind(&ErrorCallbackFunction)); |
264 base::RunLoop().RunUntilIdle(); | 265 base::RunLoop().RunUntilIdle(); |
265 } | 266 } |
266 | 267 |
267 scoped_ptr<EnumHistogramChecker> MakeResultHistogramChecker() { | 268 std::unique_ptr<EnumHistogramChecker> MakeResultHistogramChecker() { |
268 return scoped_ptr<EnumHistogramChecker>( | 269 return std::unique_ptr<EnumHistogramChecker>(new EnumHistogramChecker( |
269 new EnumHistogramChecker( | 270 "CaptivePortal.OOBE.DetectionResult", |
270 "CaptivePortal.OOBE.DetectionResult", | 271 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT, |
271 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_COUNT, | 272 original_samples_.get())); |
272 original_samples_.get())); | |
273 } | 273 } |
274 | 274 |
275 private: | 275 private: |
276 void AddService(const std::string& network_id, | 276 void AddService(const std::string& network_id, |
277 const std::string& type) { | 277 const std::string& type) { |
278 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface()-> | 278 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface()-> |
279 AddService(network_id /* service_path */, | 279 AddService(network_id /* service_path */, |
280 network_id /* guid */, | 280 network_id /* guid */, |
281 network_id /* name */, | 281 network_id /* name */, |
282 type, | 282 type, |
(...skipping 11 matching lines...) Expand all Loading... |
294 AddService(kStubCellular, shill::kTypeCellular); | 294 AddService(kStubCellular, shill::kTypeCellular); |
295 } | 295 } |
296 | 296 |
297 void SetupNetworkHandler() { | 297 void SetupNetworkHandler() { |
298 SetupDefaultShillState(); | 298 SetupDefaultShillState(); |
299 NetworkHandler::Initialize(); | 299 NetworkHandler::Initialize(); |
300 } | 300 } |
301 | 301 |
302 content::TestBrowserThreadBundle thread_bundle_; | 302 content::TestBrowserThreadBundle thread_bundle_; |
303 Profile* profile_ = nullptr; | 303 Profile* profile_ = nullptr; |
304 scoped_ptr<NetworkPortalDetectorImpl> network_portal_detector_; | 304 std::unique_ptr<NetworkPortalDetectorImpl> network_portal_detector_; |
305 scoped_ptr<base::HistogramSamples> original_samples_; | 305 std::unique_ptr<base::HistogramSamples> original_samples_; |
306 scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_; | 306 std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_; |
307 TestingProfileManager test_profile_manager_; | 307 TestingProfileManager test_profile_manager_; |
308 }; | 308 }; |
309 | 309 |
310 TEST_F(NetworkPortalDetectorImplTest, NoPortal) { | 310 TEST_F(NetworkPortalDetectorImplTest, NoPortal) { |
311 ASSERT_TRUE(is_state_idle()); | 311 ASSERT_TRUE(is_state_idle()); |
312 | 312 |
313 SetConnected(kStubWireless1); | 313 SetConnected(kStubWireless1); |
314 | 314 |
315 ASSERT_TRUE(is_state_checking_for_portal()); | 315 ASSERT_TRUE(is_state_checking_for_portal()); |
316 CheckPortalState( | 316 CheckPortalState( |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1047 ASSERT_FALSE(is_state_idle()); | 1047 ASSERT_FALSE(is_state_idle()); |
1048 | 1048 |
1049 ASSERT_TRUE( | 1049 ASSERT_TRUE( |
1050 MakeResultHistogramChecker() | 1050 MakeResultHistogramChecker() |
1051 ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE, 1) | 1051 ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE, 1) |
1052 ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1) | 1052 ->Expect(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 1) |
1053 ->Check()); | 1053 ->Check()); |
1054 } | 1054 } |
1055 | 1055 |
1056 } // namespace chromeos | 1056 } // namespace chromeos |
OLD | NEW |