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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge 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 | 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/files/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/message_loop/message_loop_proxy.h" 12 #include "base/message_loop/message_loop_proxy.h"
13 #include "base/prefs/json_pref_store.h" 13 #include "base/prefs/json_pref_store.h"
14 #include "base/prefs/pref_value_store.h" 14 #include "base/prefs/pref_value_store.h"
15 #include "base/run_loop.h" 15 #include "base/run_loop.h"
16 #include "base/sequenced_task_runner.h" 16 #include "base/sequenced_task_runner.h"
17 #include "base/synchronization/waitable_event.h" 17 #include "base/synchronization/waitable_event.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/browser/prefs/pref_service_mock_factory.h" 19 #include "chrome/browser/prefs/pref_service_mock_factory.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const { 179 PrefService* TestExtensionPrefs::CreateIncognitoPrefService() const {
180 return pref_service_->CreateIncognitoPrefService( 180 return pref_service_->CreateIncognitoPrefService(
181 new ExtensionPrefStore(extension_pref_value_map_.get(), true)); 181 new ExtensionPrefStore(extension_pref_value_map_.get(), true));
182 } 182 }
183 183
184 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) { 184 void TestExtensionPrefs::set_extensions_disabled(bool extensions_disabled) {
185 extensions_disabled_ = extensions_disabled; 185 extensions_disabled_ = extensions_disabled;
186 } 186 }
187 187
188 } // namespace extensions 188 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/test_extension_dir.cc ('k') | chrome/browser/extensions/unpacked_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698