This CL replaces user_manager::UserID with AccountId.

chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.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/extensions/extension_garbage_collector_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_util.h"
@@ skipping 50 matching lines @@
 
     CHECK(cache_dir_.CreateUniqueTempDir());
     ExtensionAssetsManagerChromeOS::SetSharedInstallDirForTesting(cache_dir());
     ExtensionGarbageCollectorChromeOS::ClearGarbageCollectedForTesting();
 
     // Initialize the UserManager singleton to a fresh FakeChromeUserManager
     // instance.
     user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
         new chromeos::FakeChromeUserManager));
 
-    GetFakeUserManager()->AddUser(chromeos::login::kStubUser);
-    GetFakeUserManager()->LoginUser(chromeos::login::kStubUser);
+    GetFakeUserManager()->AddUser(chromeos::login::StubAccountId());
+    GetFakeUserManager()->LoginUser(chromeos::login::StubAccountId());
     chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
         GetFakeUserManager()->GetActiveUser(), profile_.get());
   }
 
   void GarbageCollectExtensions() {
     ExtensionGarbageCollector::Get(profile_.get())
         ->GarbageCollectExtensionsForTest();
     // Wait for GarbageCollectExtensions task to complete.
     content::RunAllBlockingPoolTasksUntilIdle();
   }
@@ skipping 104 matching lines @@
 
   const base::DictionaryValue* shared_extensions = testing_local_state_.Get()->
       GetDictionary(ExtensionAssetsManagerChromeOS::kSharedExtensions);
   ASSERT_TRUE(shared_extensions);
 
   EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1));
   EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2));
 }
 
 }  // namespace extensions