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

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

Issue 1131113004: Convert JsonWriter::Write to taking a const ref for the in-param (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another rebase Created 5 years, 7 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 scoped_ptr<base::ListValue> managed_users_list(new base::ListValue); 48 scoped_ptr<base::ListValue> managed_users_list(new base::ListValue);
49 managed_users_list->AppendString("*"); 49 managed_users_list->AppendString("*");
50 50
51 base::DictionaryValue root_dict; 51 base::DictionaryValue root_dict;
52 root_dict.Set(policyType, policy_type_dict.Pass()); 52 root_dict.Set(policyType, policy_type_dict.Pass());
53 root_dict.Set("managed_users", managed_users_list.Pass()); 53 root_dict.Set("managed_users", managed_users_list.Pass());
54 root_dict.SetString("policy_user", account); 54 root_dict.SetString("policy_user", account);
55 root_dict.SetInteger("current_key_index", 0); 55 root_dict.SetInteger("current_key_index", 0);
56 56
57 std::string jsonPolicy; 57 std::string json_policy;
58 base::JSONWriter::WriteWithOptions( 58 base::JSONWriter::WriteWithOptions(
59 &root_dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &jsonPolicy); 59 root_dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_policy);
60 return jsonPolicy; 60 return json_policy;
61 } 61 }
62 62
63 } // namespace 63 } // namespace
64 64
65 const char LoginPolicyTestBase::kAccountPassword[] = "letmein"; 65 const char LoginPolicyTestBase::kAccountPassword[] = "letmein";
66 const char LoginPolicyTestBase::kAccountId[] = "user@example.com"; 66 const char LoginPolicyTestBase::kAccountId[] = "user@example.com";
67 67
68 LoginPolicyTestBase::LoginPolicyTestBase() { 68 LoginPolicyTestBase::LoginPolicyTestBase() {
69 // TODO(nkostylev): Fix this test harness for webview. http://crbug.com/477402 69 // TODO(nkostylev): Fix this test harness for webview. http://crbug.com/477402
70 set_use_webview(false); 70 set_use_webview(false);
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 const int bytes_written = 159 const int bytes_written =
160 base::WriteFile(PolicyFilePath(), policy.data(), policy.size()); 160 base::WriteFile(PolicyFilePath(), policy.data(), policy.size());
161 ASSERT_EQ(static_cast<int>(policy.size()), bytes_written); 161 ASSERT_EQ(static_cast<int>(policy.size()), bytes_written);
162 } 162 }
163 163
164 base::FilePath LoginPolicyTestBase::PolicyFilePath() const { 164 base::FilePath LoginPolicyTestBase::PolicyFilePath() const {
165 return temp_dir_.path().AppendASCII("policy.json"); 165 return temp_dir_.path().AppendASCII("policy.json");
166 } 166 }
167 167
168 } // namespace policy 168 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698