chromeos: moves a bunch of tests to common_unittests

ash/common/wallpaper/wallpaper_controller_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/common/wallpaper/wallpaper_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/common/wallpaper/wallpaper_view.h"
@@ skipping 357 matching lines @@
   RunAllBlockingPoolTasksUntilIdle(WmShell::Get()->blocking_pool().get());
   EXPECT_TRUE(resized_image.BackedBySameObjectAs(controller_->GetWallpaper()));
 }
 
 TEST_F(WallpaperControllerTest, GetMaxDisplaySize) {
   // Device scale factor shouldn't affect the native size.
   UpdateDisplay("1000x300*2");
   EXPECT_EQ("1000x300",
             WallpaperController::GetMaxDisplaySizeInNative().ToString());
 
-  // Rotated display should return the rotated size.
-  UpdateDisplay("1000x300*2/r");
-  EXPECT_EQ("300x1000",
-            WallpaperController::GetMaxDisplaySizeInNative().ToString());
+  // TODO: mash doesn't support rotation yet, http://crbug.com/695556.
+  if (!WmShell::Get()->IsRunningInMash()) {
+    // Rotated display should return the rotated size.
+    UpdateDisplay("1000x300*2/r");
+    EXPECT_EQ("300x1000",
+              WallpaperController::GetMaxDisplaySizeInNative().ToString());
+  }
 
   // UI Scaling shouldn't affect the native size.
   UpdateDisplay("1000x300*2@1.5");
   EXPECT_EQ("1000x300",
             WallpaperController::GetMaxDisplaySizeInNative().ToString());
 
   // First display has maximum size.
   UpdateDisplay("400x300,100x100");
   EXPECT_EQ("400x300",
             WallpaperController::GetMaxDisplaySizeInNative().ToString());
@@ skipping 69 matching lines @@
   {
     SCOPED_TRACE(base::StringPrintf("1200x600/u@1.5 low resolution"));
     controller_->SetWallpaperImage(image_low_res, WALLPAPER_LAYOUT_CENTER);
     WallpaperFitToNativeResolution(
         wallpaper_view(), low_dsf, low_resolution.width(),
         low_resolution.height(), kCustomWallpaperColor);
   }
 }
 
 }  // namespace ash