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

Side by Side Diff: chrome/browser/chromeos/settings/cros_settings_unittest.cc

Issue 851123003: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/device_identity_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 17 matching lines...) Expand all
28 namespace chromeos { 28 namespace chromeos {
29 29
30 class CrosSettingsTest : public testing::Test { 30 class CrosSettingsTest : public testing::Test {
31 protected: 31 protected:
32 CrosSettingsTest() 32 CrosSettingsTest()
33 : ui_thread_(content::BrowserThread::UI, &message_loop_), 33 : ui_thread_(content::BrowserThread::UI, &message_loop_),
34 local_state_(TestingBrowserProcess::GetGlobal()), 34 local_state_(TestingBrowserProcess::GetGlobal()),
35 settings_(DeviceSettingsService::Get()), 35 settings_(DeviceSettingsService::Get()),
36 weak_factory_(this) {} 36 weak_factory_(this) {}
37 37
38 virtual ~CrosSettingsTest() {} 38 ~CrosSettingsTest() override {}
39 39
40 void TearDown() override { 40 void TearDown() override {
41 ASSERT_TRUE(expected_props_.empty()); 41 ASSERT_TRUE(expected_props_.empty());
42 STLDeleteValues(&expected_props_); 42 STLDeleteValues(&expected_props_);
43 } 43 }
44 44
45 void FetchPref(const std::string& pref) { 45 void FetchPref(const std::string& pref) {
46 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 46 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
47 if (expected_props_.find(pref) == expected_props_.end()) 47 if (expected_props_.find(pref) == expected_props_.end())
48 return; 48 return;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 EXPECT_TRUE(wildcard_match); 259 EXPECT_TRUE(wildcard_match);
260 EXPECT_TRUE(cs->FindEmailInList( 260 EXPECT_TRUE(cs->FindEmailInList(
261 kAccountsPrefUsers, "user@example.com", &wildcard_match)); 261 kAccountsPrefUsers, "user@example.com", &wildcard_match));
262 EXPECT_FALSE(wildcard_match); 262 EXPECT_FALSE(wildcard_match);
263 EXPECT_TRUE(cs->FindEmailInList( 263 EXPECT_TRUE(cs->FindEmailInList(
264 kAccountsPrefUsers, "*@example.com", &wildcard_match)); 264 kAccountsPrefUsers, "*@example.com", &wildcard_match));
265 EXPECT_TRUE(wildcard_match); 265 EXPECT_TRUE(wildcard_match);
266 } 266 }
267 267
268 } // namespace chromeos 268 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/settings/device_identity_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698