Modernize account ids in wallpaper browsertest

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

 // Copyright 2014 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/users/wallpaper/wallpaper_manager.h"
 
 #include <stddef.h>
 
 #include "ash/shell.h"
 #include "ash/wallpaper/wallpaper_controller.h"
@@ skipping 39 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 int kLargeWallpaperWidth = 256;
 int kLargeWallpaperHeight = wallpaper::kLargeWallpaperMaxHeight;
 int kSmallWallpaperWidth = 256;
 int kSmallWallpaperHeight = wallpaper::kSmallWallpaperMaxHeight;
 
-const char kTestUser1[] = "test1@domain.com";
+const char kTestUser1Email[] = "test1@domain.com";
+const char kTestUser1Id[] = "1234567890123456789012";
 const char kTestUser1Hash[] = "test1@domain.com-hash";
-const char kTestUser2[] = "test2@domain.com";
+const char kTestUser2Email[] = "test2@domain.com";
+const char kTestUser2Id[] = "1234567890123456789013";
 const char kTestUser2Hash[] = "test2@domain.com-hash";
 
 }  // namespace
 
 class WallpaperManagerBrowserTest : public InProcessBrowserTest {
  public:
   WallpaperManagerBrowserTest() : controller_(NULL),
                                   local_state_(NULL) {
   }
 
@@ skipping 91 matching lines @@
   }
 
   ash::WallpaperController* controller_;
   PrefService* local_state_;
   std::unique_ptr<base::CommandLine> wallpaper_manager_command_line_;
 
   // Directory created by CreateCmdlineWallpapers () to store default
   // wallpaper images.
   std::unique_ptr<base::ScopedTempDir> wallpaper_dir_;
 
-  const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
-  const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
+  const AccountId test_account_id1_ =
+      AccountId::FromUserEmailGaiaId(kTestUser1Email, kTestUser1Id);
+  const AccountId test_account_id2_ =
+      AccountId::FromUserEmailGaiaId(kTestUser2Email, kTestUser2Id);
 
   const wallpaper::WallpaperFilesId test_account1_wallpaper_files_id_ =
       wallpaper::WallpaperFilesId::FromString(kTestUser1Hash);
   const wallpaper::WallpaperFilesId test_account2_wallpaper_files_id_ =
       wallpaper::WallpaperFilesId::FromString(kTestUser2Hash);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WallpaperManagerBrowserTest);
 };
 
@@ skipping 664 matching lines @@
       user_manager::StubAccountId(),
       wallpaper::WallpaperFilesId::FromString("test_hash"), "test-nofile.jpeg",
       WALLPAPER_LAYOUT_STRETCH, user_manager::User::CUSTOMIZED, image, true);
   EXPECT_TRUE(WallpaperManager::Get()->IsPendingWallpaper(
       wallpaper::WallpaperResizer::GetImageId(image)));
   wallpaper_manager_test_utils::WaitAsyncWallpaperLoadFinished();
   EXPECT_FALSE(WallpaperManager::Get()->IsPendingWallpaper(
       wallpaper::WallpaperResizer::GetImageId(image)));
 }
 }  // namespace chromeos