chrome/browser/extensions/updater/extension_updater_unittest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/updater/extension_updater_unittest.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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:

Index: chrome/browser/extensions/updater/extension_updater_unittest.cc

diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc

index 2f121852056b2a0ddfcf47615ea2db972839e777..1551700a498e8f61a5c0a3a27c0788cc221c4d02 100644

--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc

+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc

@@ -39,7 +39,7 @@

#include "chrome/browser/extensions/updater/manifest_fetch_data.h"

#include "chrome/browser/extensions/updater/request_queue_impl.h"

#include "chrome/browser/google/google_util.h"

-#include "chrome/browser/prefs/pref_service.h"

+#include "chrome/browser/prefs/pref_service_syncable.h"

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

@@ -224,7 +224,7 @@ class MockService : public TestExtensionService {

ExtensionPrefs* extension_prefs() { return prefs_->prefs(); }

- PrefServiceSyncable* pref_service() { return prefs_->pref_service(); }

+ PrefService* pref_service() { return prefs_->pref_service(); }

Blacklist* blacklist() { return &blacklist_; }