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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl_unittest.cc

Issue 9583036: Revert 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
===================================================================
--- chrome/browser/profiles/off_the_record_profile_impl_unittest.cc (revision 124830)
+++ chrome/browser/profiles/off_the_record_profile_impl_unittest.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,6 @@
#include "chrome/browser/net/ssl_config_service_manager.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_browser_process.h"
@@ -143,9 +142,6 @@
new OffTheRecordProfileImpl(parent_profile.get()));
child_profile->InitHostZoomMap();
- ProfileDependencyManager::GetInstance()->CreateProfileServices(
- child_profile.get(), false);
-
// Prepare child host zoom map.
HostZoomMap* child_zoom_map =
HostZoomMap::GetForBrowserContext(child_profile.get());
@@ -163,12 +159,12 @@
EXPECT_NE(parent_zoom_map->GetZoomLevel(host),
child_zoom_map->GetZoomLevel(host)) <<
- "Child change must not propagate to parent.";
+ "Child change must not propaget to parent.";
parent_zoom_map->SetZoomLevel(host, zoom_level_40);
ASSERT_EQ(parent_zoom_map->GetZoomLevel(host), zoom_level_40);
EXPECT_EQ(parent_zoom_map->GetZoomLevel(host),
child_zoom_map->GetZoomLevel(host)) <<
- "Parent change should propagate to child.";
+ "Parent change should propaget to child.";
}
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698