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

Side by Side Diff: chrome/browser/managed_mode/managed_user_service_browsertest.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/managed_mode/managed_user_constants.h" 10 #include "chrome/browser/managed_mode/managed_user_constants.h"
(...skipping 12 matching lines...) Expand all
23 #include "google_apis/gaia/google_service_auth_error.h" 23 #include "google_apis/gaia/google_service_auth_error.h"
24 24
25 namespace { 25 namespace {
26 26
27 void TestAuthErrorCallback(const GoogleServiceAuthError& error) {} 27 void TestAuthErrorCallback(const GoogleServiceAuthError& error) {}
28 28
29 class ManagedUserServiceTestManaged : public InProcessBrowserTest { 29 class ManagedUserServiceTestManaged : public InProcessBrowserTest {
30 public: 30 public:
31 // content::BrowserTestBase: 31 // content::BrowserTestBase:
32 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 32 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
33 command_line->AppendSwitchASCII(switches::kManagedUserId, "asdf"); 33 command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
34 } 34 }
35 }; 35 };
36 36
37 } // namespace 37 } // namespace
38 38
39 typedef InProcessBrowserTest ManagedUserServiceTest; 39 typedef InProcessBrowserTest ManagedUserServiceTest;
40 40
41 // Crashes on Mac. 41 // Crashes on Mac.
42 // http://crbug.com/339501 42 // http://crbug.com/339501
43 #if defined(OS_MACOSX) 43 #if defined(OS_MACOSX)
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index))); 135 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
136 136
137 // Remove the setting. 137 // Remove the setting.
138 settings->SetLocalSettingForTesting(managed_users::kUserName, 138 settings->SetLocalSettingForTesting(managed_users::kUserName,
139 scoped_ptr<base::Value>()); 139 scoped_ptr<base::Value>());
140 EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName)); 140 EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName));
141 profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath()); 141 profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
142 EXPECT_EQ(original_name, 142 EXPECT_EQ(original_name,
143 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index))); 143 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
144 } 144 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_user_service.cc ('k') | chrome/browser/managed_mode/managed_user_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698