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

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 14008005: Move proto files back into chrome/browser/policy/proto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/chromeos/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/chromeos/net/mock_connectivity_state_helper.h" 26 #include "chrome/browser/chromeos/net/mock_connectivity_state_helper.h"
27 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 27 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
28 #include "chrome/browser/chromeos/settings/cros_settings.h" 28 #include "chrome/browser/chromeos/settings/cros_settings.h"
29 #include "chrome/browser/chromeos/settings/device_settings_service.h" 29 #include "chrome/browser/chromeos/settings/device_settings_service.h"
30 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 30 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
31 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h" 31 #include "chrome/browser/chromeos/settings/mock_owner_key_util.h"
32 #include "chrome/browser/io_thread.h" 32 #include "chrome/browser/io_thread.h"
33 #include "chrome/browser/net/predictor.h" 33 #include "chrome/browser/net/predictor.h"
34 #include "chrome/browser/policy/browser_policy_connector.h" 34 #include "chrome/browser/policy/browser_policy_connector.h"
35 #include "chrome/browser/policy/cloud/device_management_service.h" 35 #include "chrome/browser/policy/cloud/device_management_service.h"
36 #include "chrome/browser/policy/cloud/proto/device_management_backend.pb.h"
37 #include "chrome/browser/policy/policy_service.h" 36 #include "chrome/browser/policy/policy_service.h"
37 #include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
38 #include "chrome/browser/profiles/profile_manager.h" 38 #include "chrome/browser/profiles/profile_manager.h"
39 #include "chrome/browser/rlz/rlz.h" 39 #include "chrome/browser/rlz/rlz.h"
40 #include "chrome/common/chrome_notification_types.h" 40 #include "chrome/common/chrome_notification_types.h"
41 #include "chrome/common/chrome_paths.h" 41 #include "chrome/common/chrome_paths.h"
42 #include "chrome/common/chrome_switches.h" 42 #include "chrome/common/chrome_switches.h"
43 #include "chrome/common/pref_names.h" 43 #include "chrome/common/pref_names.h"
44 #include "chrome/test/base/scoped_testing_local_state.h" 44 #include "chrome/test/base/scoped_testing_local_state.h"
45 #include "chrome/test/base/testing_browser_process.h" 45 #include "chrome/test/base/testing_browser_process.h"
46 #include "chromeos/chromeos_switches.h" 46 #include "chromeos/chromeos_switches.h"
47 #include "chromeos/cryptohome/mock_async_method_caller.h" 47 #include "chromeos/cryptohome/mock_async_method_caller.h"
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 } 747 }
748 748
749 INSTANTIATE_TEST_CASE_P( 749 INSTANTIATE_TEST_CASE_P(
750 LoginUtilsBlockingLoginTestInstance, 750 LoginUtilsBlockingLoginTestInstance,
751 LoginUtilsBlockingLoginTest, 751 LoginUtilsBlockingLoginTest,
752 testing::Values(0, 1, 2, 3, 4, 5)); 752 testing::Values(0, 1, 2, 3, 4, 5));
753 753
754 } // namespace 754 } // namespace
755 755
756 } 756 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698