Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Issue 286933002: [cros login] Split login related classes into subfolders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix includes in new tests Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" 7 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
8 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 8 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
9 #include "chrome/browser/chromeos/login/screens/update_screen.h" 9 #include "chrome/browser/chromeos/login/screens/update_screen.h"
10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
11 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
12 #include "chrome/browser/chromeos/net/network_portal_detector.h" 12 #include "chrome/browser/chromeos/net/network_portal_detector.h"
13 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" 13 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
14 #include "chromeos/chromeos_switches.h" 14 #include "chromeos/chromeos_switches.h"
15 #include "chromeos/dbus/fake_dbus_thread_manager.h" 15 #include "chromeos/dbus/fake_dbus_thread_manager.h"
16 #include "chromeos/dbus/fake_update_engine_client.h" 16 #include "chromeos/dbus/fake_update_engine_client.h"
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 using ::testing::AnyNumber; 20 using ::testing::AnyNumber;
21 using ::testing::AtLeast; 21 using ::testing::AtLeast;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); 389 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
390 EXPECT_CALL(*mock_screen_observer_, 390 EXPECT_CALL(*mock_screen_observer_,
391 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) 391 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
392 .Times(1); 392 .Times(1);
393 393
394 update_screen_->OnConnectToNetworkRequested(kStubEthernetServicePath); 394 update_screen_->OnConnectToNetworkRequested(kStubEthernetServicePath);
395 base::MessageLoop::current()->RunUntilIdle(); 395 base::MessageLoop::current()->RunUntilIdle();
396 } 396 }
397 397
398 } // namespace chromeos 398 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/screen_manager.cc ('k') | chrome/browser/chromeos/login/screens/user_image_screen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698