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

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

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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/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/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 11 matching lines...) Expand all
22 #include "content/public/test/test_utils.h" 22 #include "content/public/test/test_utils.h"
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 SupervisedUserServiceTestSupervised : public InProcessBrowserTest { 29 class SupervisedUserServiceTestSupervised : 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::kSupervisedUserId, "asdf"); 33 command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
34 } 34 }
35 }; 35 };
36 36
37 } // namespace 37 } // namespace
38 38
39 typedef InProcessBrowserTest SupervisedUserServiceTest; 39 typedef InProcessBrowserTest SupervisedUserServiceTest;
40 40
41 // Crashes on Mac. 41 // Crashes on Mac.
42 // http://crbug.com/339501 42 // http://crbug.com/339501
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index))); 136 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
137 137
138 // Remove the setting. 138 // Remove the setting.
139 settings->SetLocalSettingForTesting(supervised_users::kUserName, 139 settings->SetLocalSettingForTesting(supervised_users::kUserName,
140 scoped_ptr<base::Value>()); 140 scoped_ptr<base::Value>());
141 EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName)); 141 EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName));
142 profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath()); 142 profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
143 EXPECT_EQ(original_name, 143 EXPECT_EQ(original_name,
144 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index))); 144 base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
145 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698