Correctly integrate StoragePartition into TestingProfile.

chrome/browser/ui/views/frame/browser_view_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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include "base/memory/scoped_ptr.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
+#include "chrome/browser/predictors/predictor_database.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_io_thread_state.h"
+#include "content/public/test/test_utils.h"
 #include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/single_split_view.h"
 #include "ui/views/controls/webview/webview.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #endif
 
@@ skipping 37 matching lines @@
   virtual void TearDown() OVERRIDE;
   virtual TestingProfile* CreateProfile() OVERRIDE;
   virtual BrowserWindow* CreateBrowserWindow() OVERRIDE;
 
   void Init();
   BrowserView* browser_view() { return browser_view_; }
 
  private:
   BrowserView* browser_view_;  // Not owned.
   scoped_ptr<ScopedTestingLocalState> local_state_;
+  scoped_ptr<predictors::PredictorDatabase> predictor_db_;
+  scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
   DISALLOW_COPY_AND_ASSIGN(BrowserViewTest);
 };
 
 BrowserViewTest::BrowserViewTest()
     : browser_view_(NULL) {
 }
 
 void BrowserViewTest::SetUp() {
   Init();
   // Memory ownership is tricky here. BrowserView has taken ownership of
   // |browser|, so BrowserWithTestWindowTest cannot continue to own it.
   ASSERT_TRUE(release_browser());
 }
 
 void BrowserViewTest::TearDown() {
   // Clean up any tabs we opened, otherwise Browser crashes in destruction.
   browser_view_->browser()->tab_strip_model()->CloseAllTabs();
   // Ensure the Browser is reset before BrowserWithTestWindowTest cleans up
   // the Profile.
   browser_view_->GetWidget()->CloseNow();
   browser_view_ = NULL;
+  content::RunAllPendingInMessageLoop(content::BrowserThread::DB);
   BrowserWithTestWindowTest::TearDown();
+  testing_io_thread_state_.reset();
+  predictor_db_.reset();
 #if defined(OS_CHROMEOS)
   chromeos::input_method::Shutdown();
 #endif
   local_state_.reset(NULL);
 }
 
 TestingProfile* BrowserViewTest::CreateProfile() {
   TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
   // TemplateURLService is normally NULL during testing. Instant extended
   // needs this service so set a custom factory function.
@@ skipping 12 matching lines @@
   return NULL;
 }
 
 void BrowserViewTest::Init() {
   local_state_.reset(
       new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal()));
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InitializeForTesting(
       new chromeos::input_method::MockInputMethodManager);
 #endif
+  testing_io_thread_state_.reset(new chrome::TestingIOThreadState());
   BrowserWithTestWindowTest::SetUp();
+  predictor_db_.reset(new predictors::PredictorDatabase(GetProfile()));
   browser_view_ = static_cast<BrowserView*>(browser()->window());
 }
 
 // Test basic construction and initialization.
 TEST_F(BrowserViewTest, BrowserView) {
   // The window is owned by the native widget, not the test class.
   EXPECT_FALSE(window());
   // |browser_view_| owns the Browser, not the test class.
   EXPECT_FALSE(browser());
   EXPECT_TRUE(browser_view()->browser());
@@ skipping 134 matching lines @@
     virtual gfx::Rect GetRestoredBounds() const OVERRIDE {
       return gfx::Rect();
     }
     virtual bool IsMaximized() const OVERRIDE {
       return false;
     }
   };
 
   BrowserViewIncognitoSwitcherTest()
       : browser_view_(NULL) {}
-  virtual ~BrowserViewIncognitoSwitcherTest() {}
 
   virtual void SetUp() OVERRIDE {
     Init();
     browser_view_->Init(browser());
     (new BrowserFrame(browser_view_))->InitBrowserFrame();
     browser_view_->SetBounds(gfx::Rect(10, 10, 500, 500));
     browser_view_->Show();
     // Memory ownership is tricky here. BrowserView has taken ownership of
     // |browser|, so BrowserWithTestWindowTest cannot continue to own it.
     ASSERT_TRUE(release_browser());
@@ skipping 41 matching lines @@
   // Test initial state.
   EXPECT_TRUE(browser_view()->IsTabStripVisible());
   // Validate whether the window switcher button is the target for the position
   // passed in.
   gfx::Point switcher_point(browser_view()->window_switcher_button()->x() + 2,
                             browser_view()->window_switcher_button()->y());
   EXPECT_EQ(browser_view()->GetEventHandlerForPoint(switcher_point),
             browser_view()->window_switcher_button());
 }
 #endif