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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_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) 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 "chrome/browser/chromeos/policy/device_local_account.h" 5 #include "chrome/browser/chromeos/policy/device_local_account.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 #include "base/files/file_path.h" 21 #include "base/files/file_path.h"
22 #include "base/files/file_util.h" 22 #include "base/files/file_util.h"
23 #include "base/json/json_reader.h" 23 #include "base/json/json_reader.h"
24 #include "base/json/json_writer.h" 24 #include "base/json/json_writer.h"
25 #include "base/location.h" 25 #include "base/location.h"
26 #include "base/macros.h" 26 #include "base/macros.h"
27 #include "base/memory/ref_counted.h" 27 #include "base/memory/ref_counted.h"
28 #include "base/memory/scoped_ptr.h" 28 #include "base/memory/scoped_ptr.h"
29 #include "base/message_loop/message_loop.h" 29 #include "base/message_loop/message_loop.h"
30 #include "base/path_service.h" 30 #include "base/path_service.h"
31 #include "base/prefs/pref_change_registrar.h"
32 #include "base/prefs/pref_service.h"
33 #include "base/run_loop.h" 31 #include "base/run_loop.h"
34 #include "base/sequenced_task_runner.h" 32 #include "base/sequenced_task_runner.h"
35 #include "base/strings/string_number_conversions.h" 33 #include "base/strings/string_number_conversions.h"
36 #include "base/strings/string_util.h" 34 #include "base/strings/string_util.h"
37 #include "base/strings/stringprintf.h" 35 #include "base/strings/stringprintf.h"
38 #include "base/strings/utf_string_conversions.h" 36 #include "base/strings/utf_string_conversions.h"
39 #include "base/synchronization/lock.h" 37 #include "base/synchronization/lock.h"
40 #include "base/thread_task_runner_handle.h" 38 #include "base/thread_task_runner_handle.h"
41 #include "base/threading/sequenced_worker_pool.h" 39 #include "base/threading/sequenced_worker_pool.h"
42 #include "base/values.h" 40 #include "base/values.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 #include "chromeos/login/auth/user_context.h" 97 #include "chromeos/login/auth/user_context.h"
100 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 98 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
101 #include "components/policy/core/common/cloud/cloud_policy_core.h" 99 #include "components/policy/core/common/cloud/cloud_policy_core.h"
102 #include "components/policy/core/common/cloud/cloud_policy_store.h" 100 #include "components/policy/core/common/cloud/cloud_policy_store.h"
103 #include "components/policy/core/common/cloud/policy_builder.h" 101 #include "components/policy/core/common/cloud/policy_builder.h"
104 #include "components/policy/core/common/external_data_fetcher.h" 102 #include "components/policy/core/common/external_data_fetcher.h"
105 #include "components/policy/core/common/policy_map.h" 103 #include "components/policy/core/common/policy_map.h"
106 #include "components/policy/core/common/policy_namespace.h" 104 #include "components/policy/core/common/policy_namespace.h"
107 #include "components/policy/core/common/policy_service.h" 105 #include "components/policy/core/common/policy_service.h"
108 #include "components/policy/core/common/policy_switches.h" 106 #include "components/policy/core/common/policy_switches.h"
107 #include "components/prefs/pref_change_registrar.h"
108 #include "components/prefs/pref_service.h"
109 #include "components/signin/core/browser/signin_manager.h" 109 #include "components/signin/core/browser/signin_manager.h"
110 #include "components/user_manager/user.h" 110 #include "components/user_manager/user.h"
111 #include "components/user_manager/user_manager.h" 111 #include "components/user_manager/user_manager.h"
112 #include "components/user_manager/user_type.h" 112 #include "components/user_manager/user_type.h"
113 #include "content/public/browser/browser_thread.h" 113 #include "content/public/browser/browser_thread.h"
114 #include "content/public/browser/notification_details.h" 114 #include "content/public/browser/notification_details.h"
115 #include "content/public/browser/notification_service.h" 115 #include "content/public/browser/notification_service.h"
116 #include "content/public/browser/notification_source.h" 116 #include "content/public/browser/notification_source.h"
117 #include "content/public/browser/web_contents.h" 117 #include "content/public/browser/web_contents.h"
118 #include "content/public/browser/web_ui.h" 118 #include "content/public/browser/web_ui.h"
(...skipping 2312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2431 ASSERT_TRUE(content::ExecuteScript(contents_, 2431 ASSERT_TRUE(content::ExecuteScript(contents_,
2432 "$('tos-accept-button').click();")); 2432 "$('tos-accept-button').click();"));
2433 2433
2434 WaitForSessionStart(); 2434 WaitForSessionStart();
2435 } 2435 }
2436 2436
2437 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2437 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2438 TermsOfServiceDownloadTest, testing::Bool()); 2438 TermsOfServiceDownloadTest, testing::Bool());
2439 2439
2440 } // namespace policy 2440 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698