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

Side by Side Diff: chrome/browser/prefs/pref_service_mock_builder.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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/prefs/pref_service_mock_builder.h" 5 #include "chrome/browser/prefs/pref_service_mock_builder.h"
6 6
7 #include "base/message_loop_proxy.h" 7 #include "base/message_loop_proxy.h"
8 #include "base/prefs/default_pref_store.h" 8 #include "base/prefs/default_pref_store.h"
9 #include "base/prefs/json_pref_store.h" 9 #include "base/prefs/json_pref_store.h"
10 #include "base/prefs/testing_pref_store.h" 10 #include "base/prefs/testing_pref_store.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 PrefServiceMockBuilder& 72 PrefServiceMockBuilder&
73 PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) { 73 PrefServiceMockBuilder::WithCommandLine(CommandLine* command_line) {
74 command_line_prefs_ = new CommandLinePrefStore(command_line); 74 command_line_prefs_ = new CommandLinePrefStore(command_line);
75 return *this; 75 return *this;
76 } 76 }
77 77
78 PrefServiceMockBuilder& 78 PrefServiceMockBuilder&
79 PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) { 79 PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) {
80 return WithUserFilePrefs(prefs_file, 80 return WithUserFilePrefs(prefs_file,
81 BrowserThread::GetMessageLoopProxyForThread( 81 BrowserThread::GetMessageLoopProxyForThread(
82 BrowserThread::FILE)); 82 BrowserThread::FILE).get());
83 } 83 }
84 84
85 PrefServiceMockBuilder& 85 PrefServiceMockBuilder&
86 PrefServiceMockBuilder::WithUserFilePrefs( 86 PrefServiceMockBuilder::WithUserFilePrefs(
87 const FilePath& prefs_file, 87 const FilePath& prefs_file,
88 base::MessageLoopProxy* message_loop_proxy) { 88 base::MessageLoopProxy* message_loop_proxy) {
89 user_prefs_ = new JsonPrefStore(prefs_file, message_loop_proxy); 89 user_prefs_ = new JsonPrefStore(prefs_file, message_loop_proxy);
90 return *this; 90 return *this;
91 } 91 }
92 92
(...skipping 17 matching lines...) Expand all
110 NULL, 110 NULL,
111 false); 111 false);
112 managed_prefs_ = NULL; 112 managed_prefs_ = NULL;
113 extension_prefs_ = NULL; 113 extension_prefs_ = NULL;
114 command_line_prefs_ = NULL; 114 command_line_prefs_ = NULL;
115 user_prefs_ = NULL; 115 user_prefs_ = NULL;
116 recommended_prefs_ = NULL; 116 recommended_prefs_ = NULL;
117 user_prefs_ = new TestingPrefStore; 117 user_prefs_ = new TestingPrefStore;
118 return pref_service; 118 return pref_service;
119 } 119 }
OLDNEW
« no previous file with comments | « chrome/browser/predictors/resource_prefetcher.cc ('k') | chrome/browser/prefs/pref_value_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698