Correctly integrate StoragePartition into TestingProfile.

chrome/browser/ui/window_sizer/window_sizer_ash_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/window_sizer/window_sizer_common_unittest.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"
@@ skipping 58 matching lines @@
 gfx::Rect TestBrowserWindowAura::GetBounds() const {
   return native_window_->bounds();
 }
 
 int AlignToGridRoundDown(int location, int grid_size) {
   if (grid_size <= 1 || location % grid_size == 0)
     return location;
   return location / grid_size * grid_size;
 }
 
-// A special test class for use with browser creation - it will create a
-// browser thread and deletes it after all other things have been destroyed.
-class WindowSizerTestWithBrowser : public WindowSizerTest {
- public:
-  WindowSizerTestWithBrowser();
-  virtual ~WindowSizerTestWithBrowser();
-
- private:
-  // Note: It is important to delete the thread after the browser instances got
-  // deleted. For this we transfer the thread here.
-  scoped_ptr<content::TestBrowserThread> ui_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowSizerTestWithBrowser);
-};
-
-// The class function definitions from window_sizer_common_unittest.h
-WindowSizerTestWithBrowser::WindowSizerTestWithBrowser() {
-  // Set up a UI message thread.
-  base::MessageLoopForUI* ui_loop = message_loop();
-  ui_thread_.reset(
-      new content::TestBrowserThread(content::BrowserThread::UI, ui_loop));
-}
-
-WindowSizerTestWithBrowser::~WindowSizerTestWithBrowser() {
-}
-
 }  // namespace
 
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST_F(WindowSizerTest, DefaultSizeCase) {
   int grid = WindowSizer::kDesktopBorderSize;
   { // 4:3 monitor case, 1024x768, no taskbar
     gfx::Rect window_bounds;
     GetWindowBounds(p1024x768, p1024x768, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, NULL, gfx::Rect(), &window_bounds);
@@ skipping 334 matching lines @@
                     NULL, gfx::Rect(), &window_bounds);
     EXPECT_EQ(gfx::Rect(994 /* not 995 */,
                         738 /* not 739 */,
                         500,
                         400).ToString(),
               window_bounds.ToString());
   }
 }
 
 // Test the placement of newly created windows.
-TEST_F(WindowSizerTestWithBrowser, PlaceNewWindows) {
+TEST_F(WindowSizerTest, PlaceNewWindows) {
   // Create a dummy window.
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<aura::Window> popup(CreateTestWindowInShellWithId(1));
   popup->SetBounds(gfx::Rect(16, 32, 128, 256));
 
   scoped_ptr<aura::Window> panel(CreateTestWindowInShellWithId(2));
   panel->SetBounds(gfx::Rect(32, 48, 256, 512));
 
@@ skipping 99 matching lines @@
                         std::min(WindowSizer::kMaximumWindowWidth,
                                  1600 - 2 * WindowSizer::kDesktopBorderSize),
                         1200 - WindowSizer::kDesktopBorderSize).ToString(),
               window_bounds.ToString());
   }
 }
 
 // Test the placement of newly created windows on an empty desktop.
 // This test supplements "PlaceNewWindows" by testing the creation of a newly
 // created browser window on an empty desktop.
-TEST_F(WindowSizerTestWithBrowser, PlaceNewBrowserWindowOnEmptyDesktop) {
+TEST_F(WindowSizerTest, PlaceNewBrowserWindowOnEmptyDesktop) {
   // Create a browser which we can use to pass into the GetWindowBounds
   // function.
   scoped_ptr<TestingProfile> profile(new TestingProfile());
   Browser::CreateParams native_params(profile.get(),
                                       chrome::HOST_DESKTOP_TYPE_ASH);
   scoped_ptr<Browser> browser(
       chrome::CreateBrowserWithTestWindowForParams(&native_params));
 
   // A common screen size for Chrome OS devices where this behavior is
   // desirable.
@@ skipping 55 matching lines @@
 }
 
 #if defined(OS_CHROMEOS)
 #define MAYBE_PlaceNewWindowsOnMultipleDisplays PlaceNewWindowsOnMultipleDisplays
 #else
 // No multiple displays on windows ash.
 #define MAYBE_PlaceNewWindowsOnMultipleDisplays DISABLED_PlaceNewWindowsOnMultipleDisplays
 #endif
 
 // Test the placement of newly created windows on multiple dislays.
-TEST_F(WindowSizerTestWithBrowser, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
+TEST_F(WindowSizerTest, MAYBE_PlaceNewWindowsOnMultipleDisplays) {
   UpdateDisplay("1600x1200,1600x1200");
   const gfx::Rect secondary(1600, 0, 1600, 1200);
 
   ash::Shell::GetInstance()->set_active_root_window(
       ash::Shell::GetPrimaryRootWindow());
 
   scoped_ptr<TestingProfile> profile(new TestingProfile());
 
   // Create browser windows that are used as reference.
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
@@ skipping 68 matching lines @@
 
     gfx::Rect window_bounds;
     GetWindowBounds(p1600x1200, p1600x1200, secondary,
                     gfx::Rect(), secondary,
                     PERSISTED, new_browser.get(), gfx::Rect(), &window_bounds);
     EXPECT_EQ("0,10 300x300", window_bounds.ToString());
   }
 }
 
 // Test that the show state is properly returned for non default cases.
-TEST_F(WindowSizerTestWithBrowser, TestShowState) {
+TEST_F(WindowSizerTest, TestShowState) {
   // Creating a browser & window to play with.
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<TestingProfile> profile(new TestingProfile());
 
   scoped_ptr<BrowserWindow> browser_window(
       new TestBrowserWindowAura(window.get()));
   Browser::CreateParams window_params(Browser::TYPE_TABBED, profile.get(),
                                       chrome::HOST_DESKTOP_TYPE_ASH);
@@ skipping 84 matching lines @@
               GetWindowShowState(ui::SHOW_STATE_MAXIMIZED,
                                  ui::SHOW_STATE_DEFAULT,
                                  BOTH,
                                  browser2.get(),
                                  tiny_screen));
 
   }
 }
 
 // Test that the default show state override behavior is properly handled.
-TEST_F(WindowSizerTestWithBrowser, TestShowStateDefaults) {
+TEST_F(WindowSizerTest, TestShowStateDefaults) {
   // Creating a browser & window to play with.
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<TestingProfile> profile(new TestingProfile());
 
   scoped_ptr<BrowserWindow> browser_window(
       new TestBrowserWindowAura(window.get()));
   Browser::CreateParams window_params(Browser::TYPE_TABBED, profile.get(),
                                       chrome::HOST_DESKTOP_TYPE_ASH);
@@ skipping 49 matching lines @@
                                browser.get(),
                                p1600x1200), ui::SHOW_STATE_MAXIMIZED);
 
   // The popup should favor the initial show state over the command line.
   EXPECT_EQ(GetWindowShowState(ui::SHOW_STATE_NORMAL,
                                ui::SHOW_STATE_NORMAL,
                                BOTH,
                                popup_browser.get(),
                                p1600x1200), ui::SHOW_STATE_NORMAL);
 }