| 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 "base/macros.h" |
| 5 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 6 #include "chrome/browser/chromeos/login/helper.h" | 7 #include "chrome/browser/chromeos/login/helper.h" |
| 7 #include "chrome/browser/chromeos/login/screens/base_screen.h" | 8 #include "chrome/browser/chromeos/login/screens/base_screen.h" |
| 8 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" | 9 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" |
| 9 #include "chrome/browser/chromeos/login/screens/network_screen.h" | 10 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
| 10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" | 11 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" |
| 11 #include "chrome/browser/chromeos/login/wizard_controller.h" | 12 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 12 #include "chromeos/dbus/dbus_thread_manager.h" | 13 #include "chromeos/dbus/dbus_thread_manager.h" |
| 13 #include "chromeos/dbus/fake_session_manager_client.h" | 14 #include "chromeos/dbus/fake_session_manager_client.h" |
| 14 #include "content/public/test/test_utils.h" | 15 #include "content/public/test/test_utils.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 // EXPECT_FALSE(actor_->IsConnecting()); | 140 // EXPECT_FALSE(actor_->IsConnecting()); |
| 140 network_screen_->OnConnectionTimeout(); | 141 network_screen_->OnConnectionTimeout(); |
| 141 | 142 |
| 142 // Close infobubble with error message - it makes the test stable. | 143 // Close infobubble with error message - it makes the test stable. |
| 143 // EXPECT_FALSE(actor_->IsContinueEnabled()); | 144 // EXPECT_FALSE(actor_->IsContinueEnabled()); |
| 144 // EXPECT_FALSE(actor_->IsConnecting()); | 145 // EXPECT_FALSE(actor_->IsConnecting()); |
| 145 // actor_->ClearErrors(); | 146 // actor_->ClearErrors(); |
| 146 } | 147 } |
| 147 | 148 |
| 148 } // namespace chromeos | 149 } // namespace chromeos |
| OLD | NEW |