Correctly integrate StoragePartition into TestingProfile.

ash/test/ash_test_base.h

 // 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.
 
 #ifndef ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/client/window_types.h"
 #include "ui/views/test/test_views_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 namespace aura {
@@ skipping 24 matching lines @@
   virtual content::WebContents* CreateWebContents(
       content::BrowserContext* browser_context,
       content::SiteInstance* site_instance) OVERRIDE;
 };
 
 class AshTestBase : public testing::Test {
  public:
   AshTestBase();
   virtual ~AshTestBase();
 
-  base::MessageLoopForUI* message_loop() { return &message_loop_; }
-
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // Update the display configuration as given in |display_specs|.
   // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_specs);
 
   // Returns a RootWindow. Usually this is the active RootWindow, but that
   // method can return NULL sometimes, and in those cases, we fall back on the
@@ skipping 38 matching lines @@
 
   // Utility methods to emulate user logged in or not, session started or not
   // and user able to lock screen or not cases.
   void SetSessionStarted(bool session_started);
   void SetUserLoggedIn(bool user_logged_in);
   void SetCanLockScreen(bool can_lock_screen);
 
  private:
   bool setup_called_;
   bool teardown_called_;
-  base::MessageLoopForUI message_loop_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<AshTestHelper> ash_test_helper_;
   scoped_ptr<aura::test::EventGenerator> event_generator_;
 #if defined(OS_WIN)
   // Note that the order is important here as ipc_thread_ should be destroyed
   // after metro_viewer_host_->channel_.
   scoped_ptr<base::Thread> ipc_thread_;
   scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_