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

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

Issue 9369013: 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
Index: chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
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 18d82ec0b7b2e22a2a515469e2520e59a361cd98..21114bd42e10f6b1e2698bd315563e6b3a9bf2df 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -7,6 +7,7 @@
#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"
@@ -146,6 +147,9 @@ TEST_F(OffTheRecordProfileImplTest, GetHostZoomMap) {
scoped_ptr<Profile> child_profile(
new OffTheRecordProfileImpl(parent_profile.get()));
+ ProfileDependencyManager::GetInstance()->CreateProfileServices(
+ child_profile.get(), false);
Elliot Glaysher 2012/02/09 20:10:24 Shouldn't this be a call to OTRProfileImpl::Init()
Yoyo Zhou 2012/02/16 21:49:20 It certainly seems like it should be, but I recall
Yoyo Zhou 2012/02/22 03:02:05 Here is the crash with explicitly calling Init (I
Miranda Callahan 2012/02/27 21:59:05 This looks like one of those common threading erro
Yoyo Zhou 2012/02/28 02:03:34 Alas, BrowserWithTestWindowTest (which this test i
+
// Prepare child host zoom map.
HostZoomMap* child_zoom_map = child_profile->GetHostZoomMap();
ASSERT_TRUE(child_zoom_map);
@@ -162,12 +166,12 @@ TEST_F(OffTheRecordProfileImplTest, GetHostZoomMap) {
EXPECT_NE(parent_zoom_map->GetZoomLevel(host),
child_zoom_map->GetZoomLevel(host)) <<
- "Child change must not propaget to parent.";
+ "Child change must not propagate 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 propaget to child.";
+ "Parent change should propagate to child.";
}

Powered by Google App Engine
This is Rietveld 408576698