summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles
diff options
context:
space:
mode:
authorpatrickriordan177@gmail.com <patrickriordan177@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 08:12:10 +0000
committerpatrickriordan177@gmail.com <patrickriordan177@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 08:12:10 +0000
commitb28b3e368a1d48e142f9a33b034f242d0e79debe (patch)
tree04b7ace260a2b88c52dc2375a2362b78720ebe3d /chrome/browser/profiles
parent046a9712362dcf891a2634fee98bd9cf20bbabfb (diff)
downloadchromium_src-b28b3e368a1d48e142f9a33b034f242d0e79debe.zip
chromium_src-b28b3e368a1d48e142f9a33b034f242d0e79debe.tar.gz
chromium_src-b28b3e368a1d48e142f9a33b034f242d0e79debe.tar.bz2
Resubmit "Change RulesRegistryService to use ProfileKeyedAPI."
Original CL: 13825014 It was reverted because tab_helper didn't check for a NULL RulesRegistryService. BUG=179951 Review URL: https://chromiumcodereview.appspot.com/16252003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
-rw-r--r--chrome/browser/profiles/off_the_record_profile_impl.cc2
-rw-r--r--chrome/browser/profiles/off_the_record_profile_impl_unittest.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc
index 6fd6e94..f7cf724 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -97,8 +97,6 @@ void OffTheRecordProfileImpl::Init() {
BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
this, false);
- extensions::ExtensionSystem::Get(this)->InitForOTRProfile();
-
DCHECK_NE(IncognitoModePrefs::DISABLED,
IncognitoModePrefs::GetAvailability(profile_->GetPrefs()));
diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
index 81e29f5..0b9a9b9 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -146,7 +146,8 @@ TEST_F(OffTheRecordProfileImplTest, GetHostZoomMap) {
child_profile->InitHostZoomMap();
BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
- child_profile.get(), false);
+ child_profile.get(),
+ true); // For testing.
// Prepare child host zoom map.
HostZoomMap* child_zoom_map =