Removal of drag window to user tray icon functionality

ash/system/user/tray_user_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/tray_user_separator.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/command_line.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/gfx/animation/animation_container_element.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/tray/system_tray_notifier.h"

[oshima, 2014/02/28 23:29:33]

you probably don't need this anymore?

[Mr4D (OOO till 08-26), 2014/03/01 17:21:34]

Done.

 #endif
 
 namespace ash {
 namespace internal {
 
 class TrayUserTest : public ash::test::AshTestBase {
  public:
   TrayUserTest();
 
   // testing::Test:
@@ skipping 28 matching lines @@
   // Note that the ownership of these items is on the shelf.
   std::vector<ash::internal::TrayUser*> tray_user_;
 
   // The separator between the tray users and the rest of the menu.
   // Note: The item will get owned by the shelf.
   TrayUserSeparator* tray_user_separator_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayUserTest);
 };
 
-#if defined(OS_CHROMEOS)
-// The tray user test which tests functionality where multiple tray items are
-// visible in the system tray.
-class MultiTrayUserTest : public TrayUserTest {
- public:
-  MultiTrayUserTest() {}
-
-  virtual void SetUp() OVERRIDE {
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    command_line->AppendSwitch(ash::switches::kAshEnableMultiUserTray);
-    TrayUserTest::SetUp();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MultiTrayUserTest);
-};
-#endif
-
 TrayUserTest::TrayUserTest()
     : shelf_(NULL),
       tray_(NULL),
       delegate_(NULL),
       tray_user_separator_(NULL) {
 }
 
 void TrayUserTest::SetUp() {
   ash::test::AshTestBase::SetUp();
   shelf_ = Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
@@ skipping 157 matching lines @@
 
   // Switch to a new user - which has a capitalized name.
   ClickUserItem(&generator, 1);
   EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserID(1));
   // Since the name is capitalized, the email should be different then the
   // user_id.
   EXPECT_NE(delegate()->get_activated_user(), delegate()->GetUserEmail(1));
   tray()->CloseSystemBubble();
 }
 
-// Make sure that we show items for all users in the tray accordingly.
-TEST_F(MultiTrayUserTest, CheckTrayUserItems) {
-  InitializeParameters(1, true);
-
-  int max_users = delegate()->GetMaximumNumberOfLoggedInUsers();
-  // Checking now for each amount of users that the proper items are visible in
-  // the tray. The proper item is hereby:
-  // 2 -> User #1
-  // 1 -> User #2
-  // 0 -> User #3
-  // Note: Tray items are required to populate system tray items as well as the
-  // system tray menu. The system tray menu changes it's appearance with the
-  // addition of more users, but the system tray does not create new items after
-  // it got created.
-  for (int present_users = 1; present_users <= max_users; ++present_users) {
-    // We simulate the user addition by telling the delegate the new number of
-    // users, then change all user tray items and finally tell the tray to
-    // re-layout itself.
-    delegate()->set_logged_in_users(present_users);
-    Shell::GetInstance()->system_tray_notifier()->NotifyUserAddedToSession();
-    tray()->Layout();
-
-    // Check that the tray items are being shown in the reverse order.
-    for (int i = 0; i < max_users; i++) {
-      gfx::Rect rect =
-          tray()->GetTrayItemViewForTest(tray_user(i))->GetBoundsInScreen();
-      if (max_users - 1 - i < present_users)
-        EXPECT_FALSE(rect.IsEmpty());
-      else
-        EXPECT_TRUE(rect.IsEmpty());
-    }
-  }
-
-  // Click on the last item to see that the user changes.
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  generator.set_async(false);
-
-  // Switch to a new user - again, note that we have to click on the reverse
-  // item in the list. Since the first clickable item is 1, we get user #2.
-  gfx::Point point =
-      tray()->GetTrayItemViewForTest(tray_user(1))->
-                         GetBoundsInScreen().CenterPoint();
-
-  generator.MoveMouseTo(point.x(), point.y());
-  generator.ClickLeftButton();
-  EXPECT_EQ(delegate()->get_activated_user(), delegate()->GetUserID(1));
-}
-
 #endif
 
 }  // namespace internal
 }  // namespace ash