Correctly integrate StoragePartition into TestingProfile.

chrome/browser/ui/search/instant_ntp_prerenderer_unittest.cc

 // Copyright 2013 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 "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
 #include "chrome/browser/ui/search/instant_ntp_prerenderer.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::HistogramBase;
 using base::HistogramSamples;
 using base::StatisticsRecorder;
 
 class TestableInstantNTP : public InstantNTP {
  public:
   TestableInstantNTP(InstantNTPPrerenderer* ntp_prerenderer,
                      const std::string& instant_url,
@@ skipping 101 matching lines @@
   bool test_extended_enabled_;
   bool override_javascript_enabled_;
   bool test_javascript_enabled_;
   bool test_in_startup_;
   InstantNTP* test_ntp_;
 };
 
 class InstantNTPPrerendererTest : public testing::Test {
  public:
   InstantNTPPrerendererTest()
-      : ui_thread_(content::BrowserThread::UI),
-        instant_ntp_prerenderer_(new TestableInstantNTPPrerenderer(&profile_)) {
-  }
-
-  virtual void SetUp() OVERRIDE {
+      : instant_ntp_prerenderer_(new TestableInstantNTPPrerenderer(&profile_)) {
     base::StatisticsRecorder::Initialize();
   }
 
   TestableInstantNTPPrerenderer* instant_ntp_prerenderer() {
     return instant_ntp_prerenderer_.get();
   }
 
   Profile* profile() {
     return instant_ntp_prerenderer()->profile();
   }
 
  private:
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestableInstantNTPPrerenderer> instant_ntp_prerenderer_;
   mutable TestingProfile profile_;
 };
 
 TEST_F(InstantNTPPrerendererTest, PrefersRemoteNTPOnStartup) {
   std::string instant_url("http://instant_url");
   scoped_ptr<TestableInstantNTP> ntp(new TestableInstantNTP(
       instant_ntp_prerenderer(), instant_url, profile()));
   ntp->set_is_local(false);
   instant_ntp_prerenderer()->set_ntp(ntp.get());
@@ skipping 119 matching lines @@
 
 TEST_F(InstantNTPPrerendererTest, IsJavascriptEnabledChecksPrefs) {
   instant_ntp_prerenderer()->set_override_javascript_enabled(false);
   instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(
       prefs::kWebKitJavascriptEnabled, true);
   EXPECT_TRUE(instant_ntp_prerenderer()->IsJavascriptEnabled());
   instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(
       prefs::kWebKitJavascriptEnabled, false);
   EXPECT_FALSE(instant_ntp_prerenderer()->IsJavascriptEnabled());
 }