Revert of This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/file_system_provider/service_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/chromeos/file_system_provider/service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
@@ skipping 173 matching lines @@
   FileSystemProviderServiceTest() : profile_(NULL) {}
 
   ~FileSystemProviderServiceTest() override {}
 
   void SetUp() override {
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     profile_ = profile_manager_->CreateTestingProfile("test-user@example.com");
     user_manager_ = new FakeChromeUserManager();
-    user_manager_->AddUser(
-        AccountId::FromUserEmail(profile_->GetProfileUserName()));
+    user_manager_->AddUser(profile_->GetProfileUserName());
     user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
     extension_registry_.reset(new extensions::ExtensionRegistry(profile_));
 
     service_.reset(new Service(profile_, extension_registry_.get()));
     service_->SetFileSystemFactoryForTesting(
         base::Bind(&FakeProvidedFileSystem::Create));
     extension_ = CreateFakeExtension(kExtensionId);
 
     registry_ = new FakeRegistry;
     // Passes ownership to the service instance.
@@ skipping 337 matching lines @@
     EXPECT_EQ(1u, observer.unmounts.size());
     EXPECT_FALSE(registry_->file_system_info());
     EXPECT_FALSE(registry_->watchers());
   }
 
   service_->RemoveObserver(&observer);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos