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

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

Issue 510313002: Extensions-related fixups for scoped_refptr conversion operator removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 (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/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 } 53 }
54 54
55 private: 55 private:
56 DISALLOW_COPY_AND_ASSIGN(IncrementalTimeProvider); 56 DISALLOW_COPY_AND_ASSIGN(IncrementalTimeProvider);
57 57
58 mutable base::Time current_time_; 58 mutable base::Time current_time_;
59 }; 59 };
60 60
61 } // namespace 61 } // namespace
62 62
63 TestExtensionPrefs::TestExtensionPrefs(base::SequencedTaskRunner* task_runner) 63 TestExtensionPrefs::TestExtensionPrefs(
64 const scoped_refptr<base::SequencedTaskRunner>& task_runner)
64 : task_runner_(task_runner), extensions_disabled_(false) { 65 : task_runner_(task_runner), extensions_disabled_(false) {
65 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir()); 66 EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
66 preferences_file_ = temp_dir_.path().Append(chrome::kPreferencesFilename); 67 preferences_file_ = temp_dir_.path().Append(chrome::kPreferencesFilename);
67 extensions_dir_ = temp_dir_.path().AppendASCII("Extensions"); 68 extensions_dir_ = temp_dir_.path().AppendASCII("Extensions");
68 EXPECT_TRUE(base::CreateDirectory(extensions_dir_)); 69 EXPECT_TRUE(base::CreateDirectory(extensions_dir_));
69 70
70 ResetPrefRegistry(); 71 ResetPrefRegistry();
71 RecreateExtensionPrefs(); 72 RecreateExtensionPrefs();
72 } 73 }
73 74
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const { 180 PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {
180 return pref_service_->CreateIncognitoPrefService( 181 return pref_service_->CreateIncognitoPrefService(
181 new ExtensionPrefStore(extension_pref_value_map_.get(), true)); 182 new ExtensionPrefStore(extension_pref_value_map_.get(), true));
182 } 183 }
183 184
184 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) { 185 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) {
185 extensions_disabled_ = extensions_disabled; 186 extensions_disabled_ = extensions_disabled;
186 } 187 }
187 188
188 } // namespace extensions 189 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698