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

Side by Side Diff: chrome/browser/chromeos/system/device_disabling_browsertest.cc

Issue 2273783002: Move policy generated files to components/policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed headers Created 4 years, 3 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 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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 22 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
23 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 23 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
24 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 24 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
25 #include "chromeos/dbus/dbus_thread_manager.h" 25 #include "chromeos/dbus/dbus_thread_manager.h"
26 #include "chromeos/dbus/fake_session_manager_client.h" 26 #include "chromeos/dbus/fake_session_manager_client.h"
27 #include "chromeos/dbus/fake_shill_manager_client.h" 27 #include "chromeos/dbus/fake_shill_manager_client.h"
28 #include "chromeos/dbus/session_manager_client.h" 28 #include "chromeos/dbus/session_manager_client.h"
29 #include "chromeos/dbus/shill_manager_client.h" 29 #include "chromeos/dbus/shill_manager_client.h"
30 #include "chromeos/dbus/shill_service_client.h" 30 #include "chromeos/dbus/shill_service_client.h"
31 #include "chromeos/settings/cros_settings_names.h" 31 #include "chromeos/settings/cros_settings_names.h"
32 #include "components/policy/proto/device_management_backend.pb.h"
32 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
33 #include "content/public/test/browser_test_utils.h" 34 #include "content/public/test/browser_test_utils.h"
34 #include "dbus/object_path.h" 35 #include "dbus/object_path.h"
35 #include "policy/proto/device_management_backend.pb.h"
36 36
37 namespace chromeos { 37 namespace chromeos {
38 namespace system { 38 namespace system {
39 39
40 namespace { 40 namespace {
41 41
42 void ErrorCallbackFunction(const std::string& error_name, 42 void ErrorCallbackFunction(const std::string& error_name,
43 const std::string& error_message) { 43 const std::string& error_message) {
44 LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message; 44 LOG(ERROR) << "Shill Error: " << error_name << " : " << error_message;
45 } 45 }
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 base::RunLoop().RunUntilIdle(); 211 base::RunLoop().RunUntilIdle();
212 212
213 // Verify that the offline error screen was not shown and the device disabled 213 // Verify that the offline error screen was not shown and the device disabled
214 // screen is still being shown instead. 214 // screen is still being shown instead.
215 EXPECT_EQ(GetOobeScreenName(OobeScreen::SCREEN_DEVICE_DISABLED), 215 EXPECT_EQ(GetOobeScreenName(OobeScreen::SCREEN_DEVICE_DISABLED),
216 GetCurrentScreenName(web_contents)); 216 GetCurrentScreenName(web_contents));
217 } 217 }
218 218
219 } // namespace system 219 } // namespace system
220 } // namespace chromeos 220 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698