chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

Unified Diff: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

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

Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/content_settings_pref_provider_unittest.cc ('K') | « chrome/browser/custom_handlers/protocol_handler_registry.cc ('k') | chrome/browser/devtools/devtools_window.h » ('j') | chrome/browser/extensions/extension_prefs_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

index 5db5eca28059fcb1ecff4eeaa024a840b91c8e82..39e81c482955b2ecef25cb41342cc67304475622 100644

--- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

+++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

@@ -10,6 +10,8 @@

#include "base/message_loop.h"

#include "base/synchronization/waitable_event.h"

#include "base/utf_string_conversions.h"

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

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/custom_handlers/protocol_handler.h"

#include "chrome/test/base/testing_browser_process.h"

@@ -328,7 +330,9 @@ class ProtocolHandlerRegistryTest : public testing::Test {

TestingProfile* profile() const { return profile_.get(); }

// TODO(joi): Check if this can be removed, as well as the call to

// SetPrefService in SetUp.

- PrefServiceSyncable* pref_service() const { return profile_->GetPrefs(); }

+ PrefServiceSyncable* pref_service() const {

+ return PrefServiceSyncable::FromProfile(profile_.get());

+ }

const ProtocolHandler& test_protocol_handler() const {

return test_protocol_handler_;

}

@@ -374,7 +378,9 @@ class ProtocolHandlerRegistryTest : public testing::Test {

// TODO(joi): If pref_service() and the SetPrefService above go,

// then this could go.

- ProtocolHandlerRegistry::RegisterUserPrefs(pref_service());

+ ProtocolHandlerRegistry::RegisterUserPrefs(

+ static_cast<PrefRegistrySyncable*>(

+ pref_service()->DeprecatedGetPrefRegistry()));

Mattias Nissler (ping if slow) 2013/02/06 17:53:33 I guess you can just drop this and line 374 and re

Jói 2013/02/07 14:52:32 I did the same as Joe Thomas contributed in https:

Mattias Nissler (ping if slow) 2013/02/08 11:26:56 Good solution, thanks!

}

virtual void TearDown() {