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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/compiler_specific.h" | 6 #include "base/compiler_specific.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure()); | 86 MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure()); |
87 } | 87 } |
88 | 88 |
89 void OnNotificationRemoved(const std::string& notification_id, | 89 void OnNotificationRemoved(const std::string& notification_id, |
90 bool by_user) override { | 90 bool by_user) override { |
91 if (notification_id == kNotificationId && by_user) | 91 if (notification_id == kNotificationId && by_user) |
92 MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure()); | 92 MessageLoop::current()->PostTask(FROM_HERE, run_loop_->QuitClosure()); |
93 } | 93 } |
94 | 94 |
95 private: | 95 private: |
96 scoped_ptr<base::RunLoop> run_loop_; | 96 std::unique_ptr<base::RunLoop> run_loop_; |
97 | 97 |
98 DISALLOW_COPY_AND_ASSIGN(TestObserver); | 98 DISALLOW_COPY_AND_ASSIGN(TestObserver); |
99 }; | 99 }; |
100 | 100 |
101 } // namespace | 101 } // namespace |
102 | 102 |
103 class NetworkPortalDetectorImplBrowserTest | 103 class NetworkPortalDetectorImplBrowserTest |
104 : public LoginManagerTest, | 104 : public LoginManagerTest, |
105 public captive_portal::CaptivePortalDetectorTestBase { | 105 public captive_portal::CaptivePortalDetectorTestBase { |
106 public: | 106 public: |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy, | 297 IN_PROC_BROWSER_TEST_P(NetworkPortalDetectorImplBrowserTestIgnoreProxy, |
298 TestWithPreference) { | 298 TestWithPreference) { |
299 TestImpl(GetParam()); | 299 TestImpl(GetParam()); |
300 } | 300 } |
301 | 301 |
302 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy, | 302 INSTANTIATE_TEST_CASE_P(CaptivePortalAuthenticationIgnoresProxy, |
303 NetworkPortalDetectorImplBrowserTestIgnoreProxy, | 303 NetworkPortalDetectorImplBrowserTestIgnoreProxy, |
304 testing::Bool()); | 304 testing::Bool()); |
305 | 305 |
306 } // namespace chromeos | 306 } // namespace chromeos |
OLD | NEW |