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

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

Issue 635573005: Cleanup: Better constify some strings in chrome/browser/{chromeos,extensions}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, nit Created 6 years, 1 month 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 145
146 namespace policy { 146 namespace policy {
147 147
148 namespace { 148 namespace {
149 149
150 const char kDomain[] = "example.com"; 150 const char kDomain[] = "example.com";
151 const char kAccountId1[] = "dla1@example.com"; 151 const char kAccountId1[] = "dla1@example.com";
152 const char kAccountId2[] = "dla2@example.com"; 152 const char kAccountId2[] = "dla2@example.com";
153 const char kDisplayName1[] = "display name 1"; 153 const char kDisplayName1[] = "display name 1";
154 const char kDisplayName2[] = "display name 2"; 154 const char kDisplayName2[] = "display name 2";
155 const char* kStartupURLs[] = { 155 const char* const kStartupURLs[] = {
156 "chrome://policy", 156 "chrome://policy",
157 "chrome://about", 157 "chrome://about",
158 }; 158 };
159 const char kExistentTermsOfServicePath[] = "chromeos/enterprise/tos.txt"; 159 const char kExistentTermsOfServicePath[] = "chromeos/enterprise/tos.txt";
160 const char kNonexistentTermsOfServicePath[] = "chromeos/enterprise/tos404.txt"; 160 const char kNonexistentTermsOfServicePath[] = "chromeos/enterprise/tos404.txt";
161 const char kRelativeUpdateURL[] = "/service/update2/crx"; 161 const char kRelativeUpdateURL[] = "/service/update2/crx";
162 const char kUpdateManifestHeader[] = 162 const char kUpdateManifestHeader[] =
163 "<?xml version='1.0' encoding='UTF-8'?>\n" 163 "<?xml version='1.0' encoding='UTF-8'?>\n"
164 "<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>\n"; 164 "<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>\n";
165 const char kUpdateManifestTemplate[] = 165 const char kUpdateManifestTemplate[] =
166 " <app appid='%s'>\n" 166 " <app appid='%s'>\n"
167 " <updatecheck codebase='%s' version='%s' />\n" 167 " <updatecheck codebase='%s' version='%s' />\n"
168 " </app>\n"; 168 " </app>\n";
169 const char kUpdateManifestFooter[] = 169 const char kUpdateManifestFooter[] =
170 "</gupdate>\n"; 170 "</gupdate>\n";
171 const char kHostedAppID[] = "kbmnembihfiondgfjekmnmcbddelicoi"; 171 const char kHostedAppID[] = "kbmnembihfiondgfjekmnmcbddelicoi";
172 const char kHostedAppCRXPath[] = "extensions/hosted_app.crx"; 172 const char kHostedAppCRXPath[] = "extensions/hosted_app.crx";
173 const char kHostedAppVersion[] = "1.0.0.0"; 173 const char kHostedAppVersion[] = "1.0.0.0";
174 const char kGoodExtensionID[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf"; 174 const char kGoodExtensionID[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
175 const char kGoodExtensionCRXPath[] = "extensions/good.crx"; 175 const char kGoodExtensionCRXPath[] = "extensions/good.crx";
176 const char kGoodExtensionVersion[] = "1.0"; 176 const char kGoodExtensionVersion[] = "1.0";
177 const char kPackagedAppCRXPath[] = "extensions/platform_apps/app_window_2.crx"; 177 const char kPackagedAppCRXPath[] = "extensions/platform_apps/app_window_2.crx";
178 178
179 const char kExternalData[] = "External data"; 179 const char kExternalData[] = "External data";
180 const char kExternalDataURL[] = "http://localhost/external_data"; 180 const char kExternalDataURL[] = "http://localhost/external_data";
181 181
182 const char* kSingleRecommendedLocale[] = { 182 const char* const kSingleRecommendedLocale[] = {
183 "el", 183 "el",
184 }; 184 };
185 const char* kRecommendedLocales1[] = { 185 const char* const kRecommendedLocales1[] = {
186 "pl", 186 "pl",
187 "et", 187 "et",
188 "en-US", 188 "en-US",
189 }; 189 };
190 const char* kRecommendedLocales2[] = { 190 const char* const kRecommendedLocales2[] = {
191 "fr", 191 "fr",
192 "nl", 192 "nl",
193 }; 193 };
194 const char* kInvalidRecommendedLocale[] = { 194 const char* const kInvalidRecommendedLocale[] = {
195 "xx", 195 "xx",
196 }; 196 };
197 const char kPublicSessionLocale[] = "de"; 197 const char kPublicSessionLocale[] = "de";
198 const char kPublicSessionInputMethodIDTemplate[] = "_comp_ime_%sxkb:de:neo:ger"; 198 const char kPublicSessionInputMethodIDTemplate[] = "_comp_ime_%sxkb:de:neo:ger";
199 199
200 // The sequence token used by GetKeyboardLayoutsForLocale() for its background 200 // The sequence token used by GetKeyboardLayoutsForLocale() for its background
201 // tasks. 201 // tasks.
202 const char kSequenceToken[] = "chromeos_login_l10n_util"; 202 const char kSequenceToken[] = "chromeos_login_l10n_util";
203 203
204 // Helper that serves extension update manifests to Chrome. 204 // Helper that serves extension update manifests to Chrome.
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 dm_protocol::kChromePublicAccountPolicyType, kAccountId1, 556 dm_protocol::kChromePublicAccountPolicyType, kAccountId1,
557 device_local_account_policy_.payload().SerializeAsString()); 557 device_local_account_policy_.payload().SerializeAsString());
558 } 558 }
559 559
560 void UploadAndInstallDeviceLocalAccountPolicy() { 560 void UploadAndInstallDeviceLocalAccountPolicy() {
561 UploadDeviceLocalAccountPolicy(); 561 UploadDeviceLocalAccountPolicy();
562 session_manager_client()->set_device_local_account_policy( 562 session_manager_client()->set_device_local_account_policy(
563 kAccountId1, device_local_account_policy_.GetBlob()); 563 kAccountId1, device_local_account_policy_.GetBlob());
564 } 564 }
565 565
566 void SetRecommendedLocales(const char* recommended_locales[], 566 void SetRecommendedLocales(const char* const recommended_locales[],
567 size_t array_size) { 567 size_t array_size) {
568 em::StringListPolicyProto* session_locales_proto = 568 em::StringListPolicyProto* session_locales_proto =
569 device_local_account_policy_.payload().mutable_sessionlocales(); 569 device_local_account_policy_.payload().mutable_sessionlocales();
570 session_locales_proto->mutable_policy_options()->set_mode( 570 session_locales_proto->mutable_policy_options()->set_mode(
571 em::PolicyOptions_PolicyMode_RECOMMENDED); 571 em::PolicyOptions_PolicyMode_RECOMMENDED);
572 session_locales_proto->mutable_value()->Clear(); 572 session_locales_proto->mutable_value()->Clear();
573 for (size_t i = 0; i < array_size; ++i) { 573 for (size_t i = 0; i < array_size; ++i) {
574 session_locales_proto->mutable_value()->add_entries( 574 session_locales_proto->mutable_value()->add_entries(
575 recommended_locales[i]); 575 recommended_locales[i]);
576 } 576 }
(...skipping 1488 matching lines...) Expand 10 before | Expand all | Expand 10 after
2065 ASSERT_TRUE(content::ExecuteScript(contents_, 2065 ASSERT_TRUE(content::ExecuteScript(contents_,
2066 "$('tos-accept-button').click();")); 2066 "$('tos-accept-button').click();"));
2067 2067
2068 WaitForSessionStart(); 2068 WaitForSessionStart();
2069 } 2069 }
2070 2070
2071 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2071 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2072 TermsOfServiceDownloadTest, testing::Bool()); 2072 TermsOfServiceDownloadTest, testing::Bool());
2073 2073
2074 } // namespace policy 2074 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698