Revert r207560 and r207566 to reland r207511.

chrome/browser/chromeos/login/wallpaper_manager_browsertest.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 "chrome/browser/chromeos/login/wallpaper_manager.h"
 
+#include "ash/ash_resources/grit/ash_wallpaper_resources.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/display_manager_test_api.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chromeos/chromeos_switches.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using namespace ash;
 
 namespace chromeos {
 
 namespace {
 
-#if defined(GOOGLE_CHROME_BUILD)
-int kExpectedSmallWallpaperWidth = ash::kSmallWallpaperMaxWidth;
-int kExpectedSmallWallpaperHeight = ash::kSmallWallpaperMaxHeight;
-int kExpectedLargeWallpaperWidth = ash::kLargeWallpaperMaxWidth;
-int kExpectedLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
-#else
-// The defualt wallpaper for non official build is a gradient wallpaper which
-// stretches to fit screen.
-int kExpectedSmallWallpaperWidth = 256;
-int kExpectedSmallWallpaperHeight = ash::kSmallWallpaperMaxHeight;
-int kExpectedLargeWallpaperWidth = 256;
-int kExpectedLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
-#endif
+const int kLargeWallpaperResourceId = IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE;
+const int kSmallWallpaperResourceId = IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL;
+
+int kLargeWallpaperWidth = 256;
+int kLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;
+int kSmallWallpaperWidth = 256;
+int kSmallWallpaperHeight = ash::kSmallWallpaperMaxHeight;
 
 const char kTestUser1[] = "test@domain.com";
 
 }  // namespace
 
 class WallpaperManagerBrowserTest : public CrosInProcessBrowserTest,
                                     public DesktopBackgroundControllerObserver {
  public:
   WallpaperManagerBrowserTest () : controller_(NULL),
                                    local_state_(NULL) {
@@ skipping 31 matching lines @@
     base::MessageLoop::current()->Run();
   }
 
   virtual void OnWallpaperDataChanged() OVERRIDE {
     base::MessageLoop::current()->Quit();
   }
 
  protected:
   // Return custom wallpaper path. Create directory if not exist.
   base::FilePath GetCustomWallpaperPath(const char* sub_dir,
-                                  const std::string& email,
-                                  const std::string& id) {
+                                        const std::string& email,
+                                        const std::string& id) {
     base::FilePath wallpaper_path =
         WallpaperManager::Get()->GetCustomWallpaperPath(sub_dir, email, id);
     if (!file_util::DirectoryExists(wallpaper_path.DirName()))
       file_util::CreateDirectory(wallpaper_path.DirName());
 
     return wallpaper_path;
   }
 
   // Logs in |username|.
   void LogIn(const std::string& username) {
@@ skipping 18 matching lines @@
     return WallpaperManager::Get()->loaded_wallpapers();
   }
 
   DesktopBackgroundController* controller_;
   PrefService* local_state_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WallpaperManagerBrowserTest);
 };
 
-// The large resolution wallpaper should be loaded when a large external screen
-// is hooked up. If the external screen is smaller than small wallpaper
-// resolution, do not load large resolution wallpaper.
-IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
-                       LoadLargeWallpaperForLargeExternalScreen) {
-  LogIn(kTestUser1);
-  WaitAsyncWallpaperLoad();
-  gfx::ImageSkia wallpaper = controller_->GetWallpaper();
-
-  // Display is initialized to 800x600. The small resolution default wallpaper
-  // is expected.
-  EXPECT_EQ(kExpectedSmallWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedSmallWallpaperHeight, wallpaper.height());
-
-  // Hook up another 800x600 display.
-  UpdateDisplay("800x600,800x600");
-#if !defined(GOOGLE_CHROME_BUILD)
-  // wallpaper.width() < 800, expect to reload wallpaper.
-  WaitAsyncWallpaperLoad();
-#endif
-  // The small resolution wallpaper is expected.
-  EXPECT_EQ(kExpectedSmallWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedSmallWallpaperHeight, wallpaper.height());
-
-  // Detach the secondary display.
-  UpdateDisplay("800x600");
-  // Hook up a 2000x2000 display. The large resolution default wallpaper should
-  // be loaded.
-  UpdateDisplay("800x600,2000x2000");
-  WaitAsyncWallpaperLoad();
-  wallpaper = controller_->GetWallpaper();
-
-  // The large resolution default wallpaper is expected.
-  EXPECT_EQ(kExpectedLargeWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedLargeWallpaperHeight, wallpaper.height());
-
-  // Detach the secondary display.
-  UpdateDisplay("800x600");
-  // Hook up the 2000x2000 display again. The large resolution default wallpaper
-  // should persist. Test for crbug/165788.
-  UpdateDisplay("800x600,2000x2000");
-  WaitAsyncWallpaperLoad();
-  wallpaper = controller_->GetWallpaper();
-
-  // The large resolution default wallpaper is expected.
-  EXPECT_EQ(kExpectedLargeWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedLargeWallpaperHeight, wallpaper.height());
-}
-
-// This test is similar to LoadLargeWallpaperForExternalScreen test. Instead of
-// testing default wallpaper, it tests custom wallpaper.
+// Tests that the appropriate custom wallpaper (large vs. small) is loaded
+// depending on the desktop resolution.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LoadCustomLargeWallpaperForLargeExternalScreen) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   LogIn(kTestUser1);
   // Wait for default wallpaper loaded.
   WaitAsyncWallpaperLoad();
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       kSmallWallpaperSubDir,
       kTestUser1,
       id);
   base::FilePath large_wallpaper_path = GetCustomWallpaperPath(
       kLargeWallpaperSubDir,
       kTestUser1,
       id);
 
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
   SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
-                        ash::kDefaultSmallWallpaper.idr);
+                        kSmallWallpaperResourceId);
   SaveUserWallpaperData(kTestUser1,
                         large_wallpaper_path,
-                        ash::kDefaultLargeWallpaper.idr);
+                        kLargeWallpaperResourceId);
 
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       id,
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
   // Set the wallpaper for |kTestUser1|.
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   WaitAsyncWallpaperLoad();
   gfx::ImageSkia wallpaper = controller_->GetWallpaper();
 
   // Display is initialized to 800x600. The small resolution custom wallpaper is
   // expected.
-  EXPECT_EQ(kExpectedSmallWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedSmallWallpaperHeight, wallpaper.height());
+  EXPECT_EQ(kSmallWallpaperWidth, wallpaper.width());
+  EXPECT_EQ(kSmallWallpaperHeight, wallpaper.height());
 
   // Hook up another 800x600 display.
   UpdateDisplay("800x600,800x600");
-#if !defined(GOOGLE_CHROME_BUILD)
-  // wallpaper.width() < 800, expect to reload wallpaper.
   WaitAsyncWallpaperLoad();
-#endif
   // The small resolution custom wallpaper is expected.
-  EXPECT_EQ(kExpectedSmallWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedSmallWallpaperHeight, wallpaper.height());
+  EXPECT_EQ(kSmallWallpaperWidth, wallpaper.width());
+  EXPECT_EQ(kSmallWallpaperHeight, wallpaper.height());
 
   // Detach the secondary display.
   UpdateDisplay("800x600");
   // Hook up a 2000x2000 display. The large resolution custom wallpaper should
   // be loaded.
   UpdateDisplay("800x600,2000x2000");
   WaitAsyncWallpaperLoad();
   wallpaper = controller_->GetWallpaper();
 
   // The large resolution custom wallpaper is expected.
-  EXPECT_EQ(kExpectedLargeWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedLargeWallpaperHeight, wallpaper.height());
+  EXPECT_EQ(kLargeWallpaperWidth, wallpaper.width());
+  EXPECT_EQ(kLargeWallpaperHeight, wallpaper.height());
 
   // Detach the secondary display.
   UpdateDisplay("800x600");
   // Hook up the 2000x2000 display again. The large resolution default wallpaper
   // should persist. Test for crbug/165788.
   UpdateDisplay("800x600,2000x2000");
   WaitAsyncWallpaperLoad();
   wallpaper = controller_->GetWallpaper();
 
   // The large resolution custom wallpaper is expected.
-  EXPECT_EQ(kExpectedLargeWallpaperWidth, wallpaper.width());
-  EXPECT_EQ(kExpectedLargeWallpaperHeight, wallpaper.height());
+  EXPECT_EQ(kLargeWallpaperWidth, wallpaper.width());
+  EXPECT_EQ(kLargeWallpaperHeight, wallpaper.height());
 }
 
 // If chrome tries to reload the same wallpaper twice, the latter request should
 // be prevented. Otherwise, there are some strange animation issues as
 // described in crbug.com/158383.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        PreventReloadingSameWallpaper) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   // New user log in, a default wallpaper is loaded.
   LogIn(kTestUser1);
@@ skipping 10 matching lines @@
   wallpaper_manager->ClearWallpaperCache();
 
   // Change wallpaper to a custom wallpaper.
   std::string id = base::Int64ToString(base::Time::Now().ToInternalValue());
   base::FilePath small_wallpaper_path = GetCustomWallpaperPath(
       kSmallWallpaperSubDir,
       kTestUser1,
       id);
   SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
-                        ash::kDefaultSmallWallpaper.idr);
+                        kSmallWallpaperResourceId);
 
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       id,
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
@@ skipping 14 matching lines @@
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        MoveCustomWallpaper) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   LogIn(kTestUser1);
   WaitAsyncWallpaperLoad();
 
   base::FilePath old_wallpaper_path = wallpaper_manager->
       GetOriginalWallpaperPathForUser(kTestUser1);
   SaveUserWallpaperData(kTestUser1,
                         old_wallpaper_path,
-                        ash::kDefaultSmallWallpaper.idr);
+                        kSmallWallpaperResourceId);
   // Saves wallpaper info to local state for user |kTestUser1|.
   WallpaperInfo info = {
       "DUMMY",
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::CUSTOMIZED,
       base::Time::Now().LocalMidnight()
   };
   wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
   wallpaper_manager->SetUserWallpaper(kTestUser1);
   WaitAsyncWallpaperLoad();
@@ skipping 114 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTestNoAnimation,
                        UsePreMigrationWallpaperInfo) {
   LogIn(kTestUser1);
   WaitAsyncWallpaperLoad();
   // This test should finish normally. If timeout, it is probably because chrome
   // can not handle pre migrated user profile (M21 profile or older).
 }
 
-}  // namepace chromeos
+}  // namespace chromeos