Remove stops_event_propagation from Window, since it's broken.

ash/shell_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 "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
+#include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
@@ skipping 219 matching lines @@
       ash::internal::kShellWindowId_SystemModalContainer);
   EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
 
   modal_widget->Close();
   lock_modal_widget->Close();
   lock_widget->Close();
   widget->Close();
 }
 
 TEST_F(ShellTest, IsScreenLocked) {
-  views::Widget::InitParams widget_params(
-      views::Widget::InitParams::TYPE_WINDOW);
-
-  // A normal window does not lock the screen.
-  views::Widget* widget = CreateTestWindow(widget_params);
-  widget->Show();
-  EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
-  widget->Hide();
-  EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
-
-  // A modal window with a normal window as parent does not locks the screen.
-  views::Widget* modal_widget = views::Widget::CreateWindowWithParent(
-      new ModalWindow(), widget->GetNativeView());
-  modal_widget->Show();
-  EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
-  modal_widget->Close();
-  EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
-  widget->Close();
-
-  // A lock screen window locks the screen.
-  views::Widget* lock_widget = CreateTestWindow(widget_params);
-  ash::Shell::GetInstance()->GetContainer(
-      ash::internal::kShellWindowId_LockScreenContainer)->
-      AddChild(lock_widget->GetNativeView());
-  lock_widget->Show();
+  ash::Shell::GetInstance()->delegate()->LockScreen();
   EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
-  lock_widget->Hide();
-  EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
-
-  // A modal window with a lock window as parent does not lock the screen. The
-  // screen is locked only when a lock window is visible.
-  views::Widget* lock_modal_widget = views::Widget::CreateWindowWithParent(
-      new ModalWindow(), lock_widget->GetNativeView());
-  lock_modal_widget->Show();
-  EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
-  lock_widget->Show();
-  EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
-  lock_modal_widget->Close();
-  EXPECT_TRUE(Shell::GetInstance()->IsScreenLocked());
-  lock_widget->Close();
+  ash::Shell::GetInstance()->delegate()->UnlockScreen();
   EXPECT_FALSE(Shell::GetInstance()->IsScreenLocked());
 }
 
 // Fails on Mac, see http://crbug.com/115662
 #if defined(OS_MACOSX)
 #define MAYBE_ManagedWindowModeBasics FAILS_ManagedWindowModeBasics
 #else
 #define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
 #endif
 TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
@@ skipping 47 matching lines @@
 
   // Restoring the window restores it.
   widget->Restore();
   EXPECT_TRUE(Shell::GetInstance()->shelf()->visible());
 
   // Clean up.
   widget->Close();
 }
 
 }  // namespace ash