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

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

Issue 16703018: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 (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 "chrome/browser/extensions/test_extension_prefs.h" 5 #include "chrome/browser/extensions/test_extension_prefs.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 private: 52 private:
53 DISALLOW_COPY_AND_ASSIGN(IncrementalTimeProvider); 53 DISALLOW_COPY_AND_ASSIGN(IncrementalTimeProvider);
54 54
55 mutable base::Time current_time_; 55 mutable base::Time current_time_;
56 }; 56 };
57 57
58 } // namespace 58 } // namespace
59 59
60 TestExtensionPrefs::TestExtensionPrefs(base::SequencedTaskRunner* task_runner) 60 TestExtensionPrefs::TestExtensionPrefs(base::SequencedTaskRunner* task_runner)
61 : pref_service_(NULL), 61 : task_runner_(task_runner), extensions_disabled_(false) {
62 task_runner_(task_runner),
63 extensions_disabled_(false) {
64 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); 62 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
65 preferences_file_ = temp_dir_.path().AppendASCII("Preferences"); 63 preferences_file_ = temp_dir_.path().AppendASCII("Preferences");
66 extensions_dir_ = temp_dir_.path().AppendASCII("Extensions"); 64 extensions_dir_ = temp_dir_.path().AppendASCII("Extensions");
67 EXPECT_TRUE(file_util::CreateDirectory(extensions_dir_)); 65 EXPECT_TRUE(file_util::CreateDirectory(extensions_dir_));
68 66
69 ResetPrefRegistry(); 67 ResetPrefRegistry();
70 RecreateExtensionPrefs(); 68 RecreateExtensionPrefs();
71 } 69 }
72 70
73 TestExtensionPrefs::~TestExtensionPrefs() { 71 TestExtensionPrefs::~TestExtensionPrefs() {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const { 173 PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {
176 return pref_service_->CreateIncognitoPrefService( 174 return pref_service_->CreateIncognitoPrefService(
177 new ExtensionPrefStore(extension_pref_value_map_.get(), true)); 175 new ExtensionPrefStore(extension_pref_value_map_.get(), true));
178 } 176 }
179 177
180 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) { 178 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) {
181 extensions_disabled_ = extensions_disabled; 179 extensions_disabled_ = extensions_disabled;
182 } 180 }
183 181
184 } // namespace extensions 182 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698