Correctly integrate StoragePartition into TestingProfile.

chrome/browser/ui/ash/window_positioner_unittest.cc

 // Copyright (c) 2012 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/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_resizer.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/render_view_test.h"
-#include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace test {
 
 namespace {
@@ skipping 22 matching lines @@
 TestBrowserWindowAura::~TestBrowserWindowAura() {}
 
 } // namespace
 
 // A test class for preparing window positioner tests - it creates a testing
 // base by adding a window and a popup which can be independently
 // positioned to see where the positioner will place the window.
 class WindowPositionerTest : public AshTestBase {
  public:
   WindowPositionerTest();
-  virtual ~WindowPositionerTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
  protected:
   aura::Window* window() { return window_.get(); }
   aura::Window* popup() { return popup_.get(); }
 
   Browser* window_browser() { return window_owning_browser_.get(); }
   Browser* popup_browser() { return popup_owning_browser_.get(); }
 
   WindowPositioner* window_positioner() { return window_positioner_; }
 
   // The positioner & desktop's used grid alignment size.
   const int grid_size_;
 
  private:
   WindowPositioner* window_positioner_;
 
   // These two need to be deleted after everything else is gone.
-  scoped_ptr<content::TestBrowserThread> ui_thread_;
-  scoped_ptr<TestingProfile> profile_;
+  TestingProfile profile_;
 
   // These get created for each session.
   scoped_ptr<aura::Window> window_;
   scoped_ptr<aura::Window> popup_;
 
   scoped_ptr<BrowserWindow> browser_window_;
   scoped_ptr<BrowserWindow> browser_popup_;
 
   scoped_ptr<Browser> window_owning_browser_;
   scoped_ptr<Browser> popup_owning_browser_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPositionerTest);
 };
 
 WindowPositionerTest::WindowPositionerTest()
     : grid_size_(WindowPositioner::kMinimumWindowOffset),
       window_positioner_(NULL) {
-  // Create a message loop.
-  base::MessageLoopForUI* ui_loop = message_loop();
-  ui_thread_.reset(
-      new content::TestBrowserThread(content::BrowserThread::UI, ui_loop));
-
-  // Create a browser profile.
-  profile_.reset(new TestingProfile());
-}
-
-WindowPositionerTest::~WindowPositionerTest() {
-  profile_.reset(NULL);
-  ui_thread_.reset(NULL);
 }
 
 void WindowPositionerTest::SetUp() {
   AshTestBase::SetUp();
   // Create some default dummy windows.
   window_.reset(CreateTestWindowInShellWithId(0));
   window_->SetBounds(gfx::Rect(16, 32, 640, 320));
   popup_.reset(CreateTestWindowInShellWithId(1));
   popup_->SetBounds(gfx::Rect(16, 32, 128, 256));
 
   // Create a browser for the window.
   browser_window_.reset(new TestBrowserWindowAura(window_.get()));
-  Browser::CreateParams window_params(profile_.get(),
+  Browser::CreateParams window_params(&profile_,
                                       chrome::HOST_DESKTOP_TYPE_ASH);
   window_params.window = browser_window_.get();
   window_owning_browser_.reset(new Browser(window_params));
 
   // Creating a browser for the popup.
   browser_popup_.reset(new TestBrowserWindowAura(popup_.get()));
-  Browser::CreateParams popup_params(Browser::TYPE_POPUP, profile_.get(),
+  Browser::CreateParams popup_params(Browser::TYPE_POPUP, &profile_,
                                      chrome::HOST_DESKTOP_TYPE_ASH);
   popup_params.window = browser_popup_.get();
   popup_owning_browser_.reset(new Browser(popup_params));
 
   // We hide all windows upon start - each user is required to set it up
   // as he needs it.
   window()->Hide();
   popup()->Hide();
   window_positioner_ = new WindowPositioner();
 }
@@ skipping 145 matching lines @@
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash