Revert 170507 - Add public accounts to UserManager

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/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/file_util.h"
 #include "base/message_loop.h"
 #include "base/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/test/base/testing_browser_process.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using namespace ash;
 
 namespace chromeos {
 
 namespace {
 
+const char kTestUser1[] = "test-user@example.com";
+
 #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;
@@ skipping 34 matching lines @@
   }
 
   void WaitAsyncWallpaperLoad() {
     MessageLoop::current()->Run();
   }
 
   virtual void OnWallpaperDataChanged() OVERRIDE {
     MessageLoop::current()->Quit();
   }
 
+  // Sets |username| wallpaper.
+  void SetUserWallpaper(const std::string& username) {
+    ListPrefUpdate users_pref(local_state_, "LoggedInUsers");
+    users_pref->AppendIfNotPresent(new base::StringValue(username));
+    WallpaperManager::Get()->SetUserWallpaper(username);
+  }
+
  protected:
   // Saves bitmap |resource_id| to disk.
   void SaveUserWallpaperData(const std::string& username,
                              const FilePath& wallpaper_path,
                              int resource_id) {
     scoped_refptr<base::RefCountedStaticMemory> image_data(
         ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, ui::SCALE_FACTOR_100P));
     int written = file_util::WriteFile(
         wallpaper_path,
@@ skipping 19 matching lines @@
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LoadLargeWallpaperForLargeExternalScreen) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
 
   WallpaperInfo info = {
       "",
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       User::DEFAULT,
       base::Time::Now().LocalMidnight()
   };
-  wallpaper_manager->SetUserWallpaperInfo(UserManager::kStubUser, info, true);
+  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  SetUserWallpaper(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");
@@ skipping 13 matching lines @@
   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.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerBrowserTest,
                        LoadCustomLargeWallpaperForLargeExternalScreen) {
   WallpaperManager* wallpaper_manager = WallpaperManager::Get();
   FilePath small_wallpaper_path =
-      wallpaper_manager->GetWallpaperPathForUser(UserManager::kStubUser, true);
+      wallpaper_manager->GetWallpaperPathForUser(kTestUser1, true);
   FilePath large_wallpaper_path =
-      wallpaper_manager->GetWallpaperPathForUser(UserManager::kStubUser, false);
+      wallpaper_manager->GetWallpaperPathForUser(kTestUser1, false);
 
   // Saves the small/large resolution wallpapers to small/large custom
   // wallpaper paths.
-  SaveUserWallpaperData(UserManager::kStubUser,
+  SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
                         ash::kDefaultSmallWallpaper.idr);
-  SaveUserWallpaperData(UserManager::kStubUser,
+  SaveUserWallpaperData(kTestUser1,
                         large_wallpaper_path,
                         ash::kDefaultLargeWallpaper.idr);
 
-  // Saves wallpaper info to local state for user |UserManager::kStubUser|.
+  // 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(UserManager::kStubUser, info, true);
+  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
-  // Set the wallpaper for |UserManager::kStubUser|.
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  // Add user |kTestUser1|.
+
+  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());
 
   // Hook up another 800x600 display.
   UpdateDisplay("800x600,800x600");
@@ skipping 14 matching lines @@
   EXPECT_EQ(kExpectedLargeWallpaperHeight, 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();
   FilePath small_wallpaper_path =
-      wallpaper_manager->GetWallpaperPathForUser(UserManager::kStubUser, true);
+      wallpaper_manager->GetWallpaperPathForUser(kTestUser1, true);
 
-  SaveUserWallpaperData(UserManager::kStubUser,
+  SaveUserWallpaperData(kTestUser1,
                         small_wallpaper_path,
                         ash::kDefaultSmallWallpaper.idr);
 
-  // Saves wallpaper info to local state for user |UserManager::kStubUser|.
+  // 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(UserManager::kStubUser, info, true);
+  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
 
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  SetUserWallpaper(kTestUser1);
   EXPECT_EQ(1, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  SetUserWallpaper(kTestUser1);
   EXPECT_EQ(1, LoadedWallpapers());
   WaitAsyncWallpaperLoad();
   // Loads the same wallpaper after the initial one finished. It should be
   // prevented.
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  SetUserWallpaper(kTestUser1);
   EXPECT_EQ(1, LoadedWallpapers());
   wallpaper_manager->ClearWallpaperCache();
 
-  // Tests default wallpaper for user |UserManager::kStubUser|.
+  // Tests default wallpaper for user |kTestUser1|.
   info.file = "";
   info.type = User::DEFAULT;
-  wallpaper_manager->SetUserWallpaperInfo(UserManager::kStubUser, info, true);
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  wallpaper_manager->SetUserWallpaperInfo(kTestUser1, info, true);
+  SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
   // Loads the same wallpaper before the initial one finished. It should be
   // prevented.
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
   WaitAsyncWallpaperLoad();
-  wallpaper_manager->SetUserWallpaper(UserManager::kStubUser);
+  SetUserWallpaper(kTestUser1);
   EXPECT_EQ(2, LoadedWallpapers());
 }
 
 }  // namepace chromeos