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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc

Issue 1220963005: Update base::StartsWith calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@starts_with
Patch Set: Created 5 years, 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/prefs/testing_pref_store.h" 8 #include "base/prefs/testing_pref_store.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 10 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 scoped_ptr<base::Value>(new base::StringValue(value))); 92 scoped_ptr<base::Value>(new base::StringValue(value)));
93 } 93 }
94 94
95 void VerifySyncDataItem(syncer::SyncData sync_data) { 95 void VerifySyncDataItem(syncer::SyncData sync_data) {
96 const sync_pb::ManagedUserSettingSpecifics& supervised_user_setting = 96 const sync_pb::ManagedUserSettingSpecifics& supervised_user_setting =
97 sync_data.GetSpecifics().managed_user_setting(); 97 sync_data.GetSpecifics().managed_user_setting();
98 base::Value* expected_value = NULL; 98 base::Value* expected_value = NULL;
99 if (supervised_user_setting.name() == kAtomicItemName) { 99 if (supervised_user_setting.name() == kAtomicItemName) {
100 expected_value = atomic_setting_value_.get(); 100 expected_value = atomic_setting_value_.get();
101 } else { 101 } else {
102 EXPECT_TRUE(base::StartsWithASCII(supervised_user_setting.name(), 102 EXPECT_TRUE(base::StartsWith(supervised_user_setting.name(),
103 std::string(kSplitItemName) + ':', 103 std::string(kSplitItemName) + ':',
104 true)); 104 base::CompareCase::SENSITIVE));
105 std::string key = 105 std::string key =
106 supervised_user_setting.name().substr(strlen(kSplitItemName) + 1); 106 supervised_user_setting.name().substr(strlen(kSplitItemName) + 1);
107 EXPECT_TRUE(split_items_.GetWithoutPathExpansion(key, &expected_value)); 107 EXPECT_TRUE(split_items_.GetWithoutPathExpansion(key, &expected_value));
108 } 108 }
109 109
110 scoped_ptr<base::Value> value( 110 scoped_ptr<base::Value> value(
111 base::JSONReader::DeprecatedRead(supervised_user_setting.value())); 111 base::JSONReader::DeprecatedRead(supervised_user_setting.value()));
112 EXPECT_TRUE(expected_value->Equals(value.get())); 112 EXPECT_TRUE(expected_value->Equals(value.get()));
113 } 113 }
114 114
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // The uploaded items should not show up as settings. 282 // The uploaded items should not show up as settings.
283 const base::Value* value = NULL; 283 const base::Value* value = NULL;
284 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value)); 284 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kAtomicItemName, &value));
285 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value)); 285 EXPECT_FALSE(settings_->GetWithoutPathExpansion(kSplitItemName, &value));
286 286
287 // Restarting sync should not create any new changes. 287 // Restarting sync should not create any new changes.
288 settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS); 288 settings_service_.StopSyncing(syncer::SUPERVISED_USER_SETTINGS);
289 StartSyncing(sync_data); 289 StartSyncing(sync_data);
290 ASSERT_EQ(0u, sync_processor_->changes().size()); 290 ASSERT_EQ(0u, sync_processor_->changes().size());
291 } 291 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698