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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 108563005: Move the cloud policy protobufs into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chrome/browser/chromeos/login/user_image_manager_impl.h" 42 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
43 #include "chrome/browser/chromeos/login/user_image_manager_test_util.h" 43 #include "chrome/browser/chromeos/login/user_image_manager_test_util.h"
44 #include "chrome/browser/chromeos/login/user_manager.h" 44 #include "chrome/browser/chromeos/login/user_manager.h"
45 #include "chrome/browser/chromeos/login/webui_login_view.h" 45 #include "chrome/browser/chromeos/login/webui_login_view.h"
46 #include "chrome/browser/chromeos/login/wizard_controller.h" 46 #include "chrome/browser/chromeos/login/wizard_controller.h"
47 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h" 47 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_u til.h"
48 #include "chrome/browser/chromeos/policy/device_local_account.h" 48 #include "chrome/browser/chromeos/policy/device_local_account.h"
49 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 49 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
50 #include "chrome/browser/chromeos/policy/device_policy_builder.h" 50 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
51 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" 51 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
52 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
52 #include "chrome/browser/extensions/extension_service.h" 53 #include "chrome/browser/extensions/extension_service.h"
53 #include "chrome/browser/extensions/extension_system.h" 54 #include "chrome/browser/extensions/extension_system.h"
54 #include "chrome/browser/lifetime/application_lifetime.h" 55 #include "chrome/browser/lifetime/application_lifetime.h"
55 #include "chrome/browser/policy/browser_policy_connector.h" 56 #include "chrome/browser/policy/browser_policy_connector.h"
56 #include "chrome/browser/policy/profile_policy_connector.h" 57 #include "chrome/browser/policy/profile_policy_connector.h"
57 #include "chrome/browser/policy/profile_policy_connector_factory.h" 58 #include "chrome/browser/policy/profile_policy_connector_factory.h"
58 #include "chrome/browser/policy/proto/chromeos/chrome_device_policy.pb.h"
59 #include "chrome/browser/policy/test/local_policy_test_server.h" 59 #include "chrome/browser/policy/test/local_policy_test_server.h"
60 #include "chrome/browser/prefs/session_startup_pref.h" 60 #include "chrome/browser/prefs/session_startup_pref.h"
61 #include "chrome/browser/profiles/profile.h" 61 #include "chrome/browser/profiles/profile.h"
62 #include "chrome/browser/profiles/profile_manager.h" 62 #include "chrome/browser/profiles/profile_manager.h"
63 #include "chrome/browser/ui/browser.h" 63 #include "chrome/browser/ui/browser.h"
64 #include "chrome/browser/ui/browser_commands.h" 64 #include "chrome/browser/ui/browser_commands.h"
65 #include "chrome/browser/ui/browser_finder.h" 65 #include "chrome/browser/ui/browser_finder.h"
66 #include "chrome/browser/ui/browser_list.h" 66 #include "chrome/browser/ui/browser_list.h"
67 #include "chrome/browser/ui/browser_window.h" 67 #include "chrome/browser/ui/browser_window.h"
68 #include "chrome/browser/ui/host_desktop.h" 68 #include "chrome/browser/ui/host_desktop.h"
(...skipping 26 matching lines...) Expand all
95 #include "net/base/url_util.h" 95 #include "net/base/url_util.h"
96 #include "net/http/http_status_code.h" 96 #include "net/http/http_status_code.h"
97 #include "net/test/embedded_test_server/embedded_test_server.h" 97 #include "net/test/embedded_test_server/embedded_test_server.h"
98 #include "net/test/embedded_test_server/http_request.h" 98 #include "net/test/embedded_test_server/http_request.h"
99 #include "net/test/embedded_test_server/http_response.h" 99 #include "net/test/embedded_test_server/http_response.h"
100 #include "net/url_request/test_url_fetcher_factory.h" 100 #include "net/url_request/test_url_fetcher_factory.h"
101 #include "net/url_request/url_fetcher_delegate.h" 101 #include "net/url_request/url_fetcher_delegate.h"
102 #include "net/url_request/url_request_status.h" 102 #include "net/url_request/url_request_status.h"
103 #include "policy/policy_constants.h" 103 #include "policy/policy_constants.h"
104 #include "testing/gmock/include/gmock/gmock.h" 104 #include "testing/gmock/include/gmock/gmock.h"
105 //#include "third_party/cros_system_api/dbus/service_constants.h"
106 #include "ui/base/l10n/l10n_util.h" 105 #include "ui/base/l10n/l10n_util.h"
107 #include "ui/gfx/image/image_skia.h" 106 #include "ui/gfx/image/image_skia.h"
108 #include "url/gurl.h" 107 #include "url/gurl.h"
108 //#include "third_party/cros_system_api/dbus/service_constants.h"
109 109
110 namespace em = enterprise_management; 110 namespace em = enterprise_management;
111 111
112 using chromeos::LoginScreenContext; 112 using chromeos::LoginScreenContext;
113 using testing::InvokeWithoutArgs; 113 using testing::InvokeWithoutArgs;
114 using testing::Return; 114 using testing::Return;
115 using testing::_; 115 using testing::_;
116 116
117 namespace policy { 117 namespace policy {
118 118
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 if (!IsSessionStarted()) { 1177 if (!IsSessionStarted()) {
1178 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, 1178 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
1179 base::Bind(IsSessionStarted)).Wait(); 1179 base::Bind(IsSessionStarted)).Wait();
1180 } 1180 }
1181 } 1181 }
1182 1182
1183 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance, 1183 INSTANTIATE_TEST_CASE_P(TermsOfServiceTestInstance,
1184 TermsOfServiceTest, testing::Bool()); 1184 TermsOfServiceTest, testing::Bool());
1185 1185
1186 } // namespace policy 1186 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698