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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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/macros.h" 6 #include "base/macros.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h" 9 #include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
11 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" 10 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
12 #include "chrome/browser/chromeos/login/screens/network_error.h" 11 #include "chrome/browser/chromeos/login/screens/network_error.h"
13 #include "chrome/browser/chromeos/login/screens/update_screen.h" 12 #include "chrome/browser/chromeos/login/screens/update_screen.h"
14 #include "chrome/browser/chromeos/login/startup_utils.h" 13 #include "chrome/browser/chromeos/login/startup_utils.h"
15 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" 14 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
16 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
17 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" 16 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
18 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
19 #include "chromeos/chromeos_switches.h" 18 #include "chromeos/chromeos_switches.h"
20 #include "chromeos/dbus/dbus_thread_manager.h" 19 #include "chromeos/dbus/dbus_thread_manager.h"
21 #include "chromeos/dbus/fake_update_engine_client.h" 20 #include "chromeos/dbus/fake_update_engine_client.h"
22 #include "chromeos/network/portal_detector/network_portal_detector.h" 21 #include "chromeos/network/portal_detector/network_portal_detector.h"
22 #include "components/prefs/pref_service.h"
23 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 25
26 using ::testing::AnyNumber; 26 using ::testing::AnyNumber;
27 using ::testing::AtLeast; 27 using ::testing::AtLeast;
28 using ::testing::Exactly; 28 using ::testing::Exactly;
29 using ::testing::Invoke; 29 using ::testing::Invoke;
30 using ::testing::Return; 30 using ::testing::Return;
31 using ::testing::_; 31 using ::testing::_;
32 32
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); 398 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
399 EXPECT_CALL(*mock_base_screen_delegate_, 399 EXPECT_CALL(*mock_base_screen_delegate_,
400 OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE, 400 OnExit(_, BaseScreenDelegate::UPDATE_ERROR_CHECKING_FOR_UPDATE,
401 _)).Times(1); 401 _)).Times(1);
402 402
403 update_screen_->OnConnectRequested(); 403 update_screen_->OnConnectRequested();
404 base::MessageLoop::current()->RunUntilIdle(); 404 base::MessageLoop::current()->RunUntilIdle();
405 } 405 }
406 406
407 } // namespace chromeos 407 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698