Updates the display message in the uber tray.

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 12 matching lines @@
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/tray_display.h"
+#endif
+
 #if defined(OS_WIN)
 #include "ash/test/test_metro_viewer_process_host.h"
 #include "base/test/test_process_killer_win.h"
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "ui/aura/remote_root_window_host_win.h"
 #include "ui/aura/root_window_host_win.h"
 #include "win8/test/test_registrar_constants.h"
 #endif
 
@@ skipping 64 matching lines @@
 
   ash_test_helper_->SetUp();
 
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->ShowRootWindow();
   // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
   Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
   ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
 
+#if defined(OS_CHROMEOS)
+  // We do not want to see the notification for display configuration change,
+  // since it may trap mouse events unexpectedly.
+  // TODO(mukai): remove this code when the display notification code is moved
+  // to the message center.
+  internal::TrayDisplay::SetDisplayNotificationsEnabledForTest(false);
+#endif
+
 #if defined(OS_WIN)
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kForceAshToDesktop)) {
     ipc_thread_.reset(new base::Thread("test_metro_viewer_ipc_thread"));
     base::Thread::Options options;
     options.message_loop_type = base::MessageLoop::TYPE_IO;
     ipc_thread_->StartWithOptions(options);
 
     metro_viewer_host_.reset(
@@ skipping 145 matching lines @@
       SetHasActiveUser(user_logged_in);
 }
 
 void AshTestBase::SetCanLockScreen(bool can_lock_screen) {
   ash_test_helper_->test_shell_delegate()->test_session_state_delegate()->
       SetCanLockScreen(can_lock_screen);
 }
 
 }  // namespace test
 }  // namespace ash