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

Side by Side Diff: sync/engine/apply_control_data_updates_unittest.cc

Issue 792343004: Standardize usage of virtual/override/final specifiers in sync/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « sync/api/syncable_service.h ('k') | sync/engine/directory_commit_contribution_unittest.cc » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/format_macros.h" 5 #include "base/format_macros.h"
6 #include "base/location.h" 6 #include "base/location.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "sync/engine/apply_control_data_updates.h" 10 #include "sync/engine/apply_control_data_updates.h"
(...skipping 17 matching lines...) Expand all
28 namespace syncer { 28 namespace syncer {
29 29
30 using syncable::MutableEntry; 30 using syncable::MutableEntry;
31 using syncable::UNITTEST; 31 using syncable::UNITTEST;
32 using syncable::Id; 32 using syncable::Id;
33 33
34 class ApplyControlDataUpdatesTest : public ::testing::Test { 34 class ApplyControlDataUpdatesTest : public ::testing::Test {
35 public: 35 public:
36 protected: 36 protected:
37 ApplyControlDataUpdatesTest() {} 37 ApplyControlDataUpdatesTest() {}
38 virtual ~ApplyControlDataUpdatesTest() {} 38 ~ApplyControlDataUpdatesTest() override {}
39 39
40 virtual void SetUp() { 40 void SetUp() override {
41 dir_maker_.SetUp(); 41 dir_maker_.SetUp();
42 entry_factory_.reset(new TestEntryFactory(directory())); 42 entry_factory_.reset(new TestEntryFactory(directory()));
43 } 43 }
44 44
45 virtual void TearDown() { 45 void TearDown() override { dir_maker_.TearDown(); }
46 dir_maker_.TearDown();
47 }
48 46
49 syncable::Directory* directory() { 47 syncable::Directory* directory() {
50 return dir_maker_.directory(); 48 return dir_maker_.directory();
51 } 49 }
52 50
53 TestIdFactory id_factory_; 51 TestIdFactory id_factory_;
54 scoped_ptr<TestEntryFactory> entry_factory_; 52 scoped_ptr<TestEntryFactory> entry_factory_;
55 private: 53 private:
56 base::MessageLoop loop_; // Needed for directory init. 54 base::MessageLoop loop_; // Needed for directory init.
57 TestDirectorySetterUpper dir_maker_; 55 TestDirectorySetterUpper dir_maker_;
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 local_specifics); 908 local_specifics);
911 ApplyControlDataUpdates(directory()); 909 ApplyControlDataUpdates(directory());
912 910
913 EXPECT_FALSE(entry_factory_->GetIsUnappliedForItem(experiment_handle)); 911 EXPECT_FALSE(entry_factory_->GetIsUnappliedForItem(experiment_handle));
914 EXPECT_TRUE( 912 EXPECT_TRUE(
915 entry_factory_->GetLocalSpecificsForItem(experiment_handle). 913 entry_factory_->GetLocalSpecificsForItem(experiment_handle).
916 experiments().keystore_encryption().enabled()); 914 experiments().keystore_encryption().enabled());
917 } 915 }
918 916
919 } // namespace syncer 917 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/api/syncable_service.h ('k') | sync/engine/directory_commit_contribution_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698