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

Side by Side Diff: chrome/browser/extensions/extension_management_unittest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/json/json_parser.h" 8 #include "base/json/json_parser.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/prefs/pref_registry_simple.h" 10 #include "base/prefs/pref_registry_simple.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 } // namespace 54 } // namespace
55 55
56 class ExtensionManagementServiceTest : public testing::Test { 56 class ExtensionManagementServiceTest : public testing::Test {
57 public: 57 public:
58 typedef ExtensionManagementPrefUpdater<TestingPrefServiceSimple> PrefUpdater; 58 typedef ExtensionManagementPrefUpdater<TestingPrefServiceSimple> PrefUpdater;
59 59
60 ExtensionManagementServiceTest() {} 60 ExtensionManagementServiceTest() {}
61 virtual ~ExtensionManagementServiceTest() {} 61 virtual ~ExtensionManagementServiceTest() {}
62 62
63 // testing::Test: 63 // testing::Test:
64 virtual void SetUp() OVERRIDE { 64 virtual void SetUp() override {
65 InitPrefService(); 65 InitPrefService();
66 } 66 }
67 67
68 void InitPrefService() { 68 void InitPrefService() {
69 extension_management_.reset(); 69 extension_management_.reset();
70 pref_service_.reset(new TestingPrefServiceSimple()); 70 pref_service_.reset(new TestingPrefServiceSimple());
71 pref_service_->registry()->RegisterListPref( 71 pref_service_->registry()->RegisterListPref(
72 pref_names::kAllowedInstallSites); 72 pref_names::kAllowedInstallSites);
73 pref_service_->registry()->RegisterListPref(pref_names::kAllowedTypes); 73 pref_service_->registry()->RegisterListPref(pref_names::kAllowedTypes);
74 pref_service_->registry()->RegisterListPref(pref_names::kInstallDenyList); 74 pref_service_->registry()->RegisterListPref(pref_names::kInstallDenyList);
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 EXPECT_FALSE(error.empty()); 637 EXPECT_FALSE(error.empty());
638 638
639 CreateExtension(Manifest::INTERNAL); 639 CreateExtension(Manifest::INTERNAL);
640 error.clear(); 640 error.clear();
641 EXPECT_FALSE(MustRemainEnabled(extension_.get(), NULL)); 641 EXPECT_FALSE(MustRemainEnabled(extension_.get(), NULL));
642 EXPECT_FALSE(MustRemainEnabled(extension_.get(), &error)); 642 EXPECT_FALSE(MustRemainEnabled(extension_.get(), &error));
643 EXPECT_TRUE(error.empty()); 643 EXPECT_TRUE(error.empty());
644 } 644 }
645 645
646 } // namespace extensions 646 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698