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

Unified Diff: chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_shared_settings_update_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc
similarity index 63%
rename from chrome/browser/managed_mode/managed_user_shared_settings_update_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc
index 54fafb7604ddb0123cebcfdad6591eddcc5dcffa..1266ccdeedd6ce406fb545e351ee27487cd6ea0b 100644
--- a/chrome/browser/managed_mode/managed_user_shared_settings_update_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc
@@ -4,16 +4,16 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_update.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_update.h"
#include "chrome/test/base/testing_profile.h"
#include "sync/api/sync_change.h"
#include "testing/gtest/include/gtest/gtest.h"
-class ManagedUserSharedSettingsUpdateTest : public testing::Test {
+class SupervisedUserSharedSettingsUpdateTest : public testing::Test {
public:
- ManagedUserSharedSettingsUpdateTest() : service_(profile_.GetPrefs()) {}
- virtual ~ManagedUserSharedSettingsUpdateTest() {}
+ SupervisedUserSharedSettingsUpdateTest() : service_(profile_.GetPrefs()) {}
+ virtual ~SupervisedUserSharedSettingsUpdateTest() {}
void OnSettingUpdated(bool success) {
result_.reset(new bool(success));
@@ -21,23 +21,23 @@ class ManagedUserSharedSettingsUpdateTest : public testing::Test {
protected:
TestingProfile profile_;
- ManagedUserSharedSettingsService service_;
+ SupervisedUserSharedSettingsService service_;
scoped_ptr<bool> result_;
};
-TEST_F(ManagedUserSharedSettingsUpdateTest, Success) {
- ManagedUserSharedSettingsUpdate update(
+TEST_F(SupervisedUserSharedSettingsUpdateTest, Success) {
+ SupervisedUserSharedSettingsUpdate update(
&service_,
"abcdef",
"name",
scoped_ptr<base::Value>(new base::StringValue("Hans Moleman")),
- base::Bind(&ManagedUserSharedSettingsUpdateTest::OnSettingUpdated,
+ base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
syncer::SyncChangeList changes;
changes.push_back(syncer::SyncChange(
FROM_HERE,
syncer::SyncChange::ACTION_UPDATE,
- ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+ SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
"abcdef", "name", base::StringValue("Hans Moleman"), true)));
syncer::SyncError error = service_.ProcessSyncChanges(FROM_HERE, changes);
EXPECT_FALSE(error.IsSet()) << error.ToString();
@@ -45,13 +45,13 @@ TEST_F(ManagedUserSharedSettingsUpdateTest, Success) {
EXPECT_TRUE(*result_);
}
-TEST_F(ManagedUserSharedSettingsUpdateTest, Failure) {
- ManagedUserSharedSettingsUpdate update(
+TEST_F(SupervisedUserSharedSettingsUpdateTest, Failure) {
+ SupervisedUserSharedSettingsUpdate update(
&service_,
"abcdef",
"name",
scoped_ptr<base::Value>(new base::StringValue("Hans Moleman")),
- base::Bind(&ManagedUserSharedSettingsUpdateTest::OnSettingUpdated,
+ base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
// Syncing down a different change will cause the update to fail.
@@ -59,7 +59,7 @@ TEST_F(ManagedUserSharedSettingsUpdateTest, Failure) {
changes.push_back(syncer::SyncChange(
FROM_HERE,
syncer::SyncChange::ACTION_UPDATE,
- ManagedUserSharedSettingsService::CreateSyncDataForSetting(
+ SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
"abcdef",
"name",
base::StringValue("Barney Gumble"),
@@ -70,14 +70,14 @@ TEST_F(ManagedUserSharedSettingsUpdateTest, Failure) {
EXPECT_FALSE(*result_);
}
-TEST_F(ManagedUserSharedSettingsUpdateTest, Cancel) {
+TEST_F(SupervisedUserSharedSettingsUpdateTest, Cancel) {
{
- ManagedUserSharedSettingsUpdate update(
+ SupervisedUserSharedSettingsUpdate update(
&service_,
"abcdef",
"name",
scoped_ptr<base::Value>(new base::StringValue("Hans Moleman")),
- base::Bind(&ManagedUserSharedSettingsUpdateTest::OnSettingUpdated,
+ base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
base::Unretained(this)));
ASSERT_FALSE(result_);
}

Powered by Google App Engine
This is Rietveld 408576698