Re-commit 106660 with the crashing test disabled.

chrome/browser/extensions/extension_settings_frontend_unittest.cc

Index: chrome/browser/extensions/extension_settings_frontend_unittest.cc
diff --git a/chrome/browser/extensions/extension_settings_frontend_unittest.cc b/chrome/browser/extensions/extension_settings_frontend_unittest.cc
index 076eda325153cd93e0e95e1272f36bf57904d95c..d245850f4f14876bb6aa9cd98ca451896d2e4520 100644
--- a/chrome/browser/extensions/extension_settings_frontend_unittest.cc
+++ b/chrome/browser/extensions/extension_settings_frontend_unittest.cc
@@ -23,13 +23,13 @@ class ExtensionSettingsFrontendTest : public testing::Test {
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    frontend_.reset(new ExtensionSettingsFrontend(temp_dir_.path()));
     profile_.reset(new TestingProfile(temp_dir_.path()));
+    frontend_.reset(new ExtensionSettingsFrontend(profile_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
-    profile_.reset();
     frontend_.reset();
+    profile_.reset();
   }
 
  protected:
@@ -45,8 +45,8 @@ class ExtensionSettingsFrontendTest : public testing::Test {
   }
 
   ScopedTempDir temp_dir_;
-  scoped_ptr<ExtensionSettingsFrontend> frontend_;
   scoped_ptr<TestingProfile> profile_;
+  scoped_ptr<ExtensionSettingsFrontend> frontend_;
 
  private:
   // Intended as a ExtensionSettingsFrontend::BackendCallback from GetBackend.
@@ -77,7 +77,7 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsPreservedAcrossReconstruction) {
   ASSERT_FALSE(result.HasError());
   EXPECT_FALSE(result.GetSettings()->empty());
 
-  frontend_.reset(new ExtensionSettingsFrontend(temp_dir_.path()));
+  frontend_.reset(new ExtensionSettingsFrontend(profile_.get()));
   GetBackend(&backend);
   storage = backend->GetStorage(id);