Moves management of transients out of Window

chrome/browser/notifications/desktop_notifications_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/notifications/desktop_notifications_unittest.h"
 
 #include "base/prefs/testing_pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/balloon_notification_ui_manager.h"
 #include "chrome/browser/notifications/fake_balloon_view.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/message_center/message_center.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #endif
 
+#if defined(USE_AURA)
+#include "ui/views/corewm/transient_window_stacking_client.h"
+#endif
+
 
 using content::BrowserThread;
 
 // static
 const int MockBalloonCollection::kMockBalloonSpace = 5;
 
 // static
 std::string DesktopNotificationsTest::log_output_;
 
 MockBalloonCollection::MockBalloonCollection() {}
@@ skipping 56 matching lines @@
 DesktopNotificationsTest::DesktopNotificationsTest()
     : ui_thread_(BrowserThread::UI, &message_loop_),
       balloon_collection_(NULL) {
 }
 
 DesktopNotificationsTest::~DesktopNotificationsTest() {
 }
 
 void DesktopNotificationsTest::SetUp() {
   ui::InitializeInputMethodForTesting();
+#if defined(USE_AURA)
+  // SetWindowStackingClient() takes ownership of TransientWindowStackingClient.
+  aura::client::SetWindowStackingClient(
+      new views::corewm::TransientWindowStackingClient);
+#endif
 #if defined(USE_ASH)
   ui::ScopedAnimationDurationScaleMode normal_duration_mode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   // The message center is notmally initialized on |g_browser_process| which
   // is not created for these tests.
   message_center::MessageCenter::Initialize();
   // The ContextFactory must exist before any Compositors are created.
   bool allow_test_contexts = true;
   ui::InitializeContextFactoryForTests(allow_test_contexts);
   // MockBalloonCollection retrieves information about the screen on creation.
   // So it is necessary to make sure the desktop gets created first.
   ash::Shell::CreateInstance(new ash::test::TestShellDelegate);
 #endif
-
   chrome::RegisterLocalState(local_state_.registry());
   profile_.reset(new TestingProfile());
   ui_manager_.reset(new BalloonNotificationUIManager(&local_state_));
   balloon_collection_ = new MockBalloonCollection();
   ui_manager_->SetBalloonCollection(balloon_collection_);
   service_.reset(new DesktopNotificationService(profile(), ui_manager_.get()));
   log_output_.clear();
 }
 
 void DesktopNotificationsTest::TearDown() {
   service_.reset(NULL);
   ui_manager_.reset(NULL);
   profile_.reset(NULL);
 #if defined(USE_ASH)
   ash::Shell::DeleteInstance();
   // The message center is notmally shutdown on |g_browser_process| which
   // is not created for these tests.
   message_center::MessageCenter::Shutdown();
   aura::Env::DeleteInstance();
   ui::TerminateContextFactoryForTests();
 #endif
+#if defined(USE_AURA)
+  aura::client::SetWindowStackingClient(NULL);
+#endif
   ui::ShutdownInputMethodForTesting();
 }
 
 content::ShowDesktopNotificationHostMsgParams
 DesktopNotificationsTest::StandardTestNotification() {
   content::ShowDesktopNotificationHostMsgParams params;
   params.notification_id = 0;
   params.origin = GURL("http://www.google.com");
   params.icon_url = GURL("/icon.png");
   params.title = ASCIIToUTF16("Title");
@@ skipping 415 matching lines @@
   }
 
   // Now change the position to upper left.  Confirm that the X value for the
   // balloons gets smaller.
   local_state_.SetInteger(prefs::kDesktopNotificationPosition,
                           BalloonCollection::UPPER_LEFT);
 
   int current_x = (*balloons.begin())->GetPosition().x();
   EXPECT_LT(current_x, last_x);
 }