Revert "chromeos: Move files in //ash/common to //ash, part 3"

chrome/browser/ui/ash/system_tray_client_browsertest.cc

 // Copyright 2016 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/ui/ash/system_tray_client.h"
 
+#include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/update/tray_update.h"
-#include "ash/wm_shell.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
 
 ash::TrayUpdate* GetTrayUpdate() {
   return ash::WmShell::Get()
       ->GetPrimaryRootWindowController()
       ->GetSystemTray()
       ->tray_update();
 }
@@ skipping 22 matching lines @@
   // When no update is pending, the icon isn't visible.
   EXPECT_FALSE(tray_update->tray_view()->visible());
 
   // Simulate a Flash update. This sends a mojo message to ash.
   SystemTrayClient::Get()->SetFlashUpdateAvailable();
   content::RunAllPendingInMessageLoop();
 
   // Tray icon is now visible.
   EXPECT_TRUE(tray_update->tray_view()->visible());
 }