Partially revert r54071.

chrome/browser/tab_contents/web_contents_unittest.cc

 // Copyright (c) 2010 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.
 
 #include "app/message_box_flags.h"
 #include "base/logging.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
@@ skipping 25 matching lines @@
   params->searchable_form_encoding = std::string();
   params->password_form = PasswordForm();
   params->security_info = std::string();
   params->gesture = NavigationGestureUser;
   params->is_post = false;
 }
 
 // Subclass the TestingProfile so that it can return certain services we need.
 class TabContentsTestingProfile : public TestingProfile {
  public:
-  TabContentsTestingProfile() : TestingProfile() {
-    CreateBookmarkModel(false);
-  }
+  TabContentsTestingProfile() : TestingProfile() { }
 
   virtual PrefService* GetPrefs() {
     if (!prefs_.get()) {
       FilePath source_path;
       PathService::Get(chrome::DIR_TEST_DATA, &source_path);
       source_path = source_path.AppendASCII("profiles")
           .AppendASCII("chrome_prefs").AppendASCII("Preferences");
 
       // Create a preference service that only contains user defined
       // preference values.
@@ skipping 140 matching lines @@
  public:
   TabContentsTest()
       : RenderViewHostTestHarness(),
         ui_thread_(ChromeThread::UI, &message_loop_) {
   }
 
  private:
   // Supply our own profile so we use the correct profile data. The test harness
   // is not supposed to overwrite a profile if it's already created.
   virtual void SetUp() {
-    TestingProfile* profile = new TestingProfile();
-    profile_.reset(profile);
+    profile_.reset(new TabContentsTestingProfile());
 
     RenderViewHostTestHarness::SetUp();
   }
 
   virtual void TearDown() {
     RenderViewHostTestHarness::TearDown();
 
     profile_.reset(NULL);
   }
 
@@ skipping 1249 matching lines @@
 
   // While the interstitial is showing, let's simulate the hidden page
   // attempting to show a JS message.
   IPC::Message* dummy_message = new IPC::Message;
   bool did_suppress_message = false;
   contents()->RunJavaScriptMessage(L"This is an informative message", L"OK",
       kGURL, MessageBoxFlags::kIsJavascriptAlert, dummy_message,
       &did_suppress_message);
   EXPECT_TRUE(did_suppress_message);
 }