Revert of GetAccountIdFromProfile() should not return an empty account id if a valid profile is provided.

chrome/browser/signin/signin_error_notifier_ash_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/signin/signin_error_notifier_ash.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 16 matching lines @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/message_center/notification.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/display/screen.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
-#endif
-
 namespace ash {
 namespace test {
 
 namespace {
 
 static const char kTestAccountId[] = "testuser@test.com";
 
 // Notification ID corresponding to kProfileSigninNotificationId +
 // kTestAccountId.
 static const std::string kNotificationId =
     "chrome://settings/signin/testuser@test.com";
 }
 
 class SigninErrorNotifierTest : public AshTestBase {
  public:
   void SetUp() override {
     // Create a signed-in profile.
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               BuildFakeSigninManagerBase);
     profile_ = builder.Build();
     profile_->set_profile_name(kTestAccountId);
 
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
-#if defined(OS_CHROMEOS)
-    mock_user_manager_ = new chromeos::MockUserManager();
-    user_manager_enabler_.reset(
-        new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
-#endif
-
     TestingBrowserProcess::GetGlobal();
     AshTestBase::SetUp();
 
     // Set up screen for Windows.
 #if defined(OS_WIN)
     test_screen_.reset(aura::TestScreen::Create(gfx::Size()));
     display::Screen::SetScreenInstance(test_screen_.get());
 #endif
 
     error_controller_ = SigninErrorControllerFactory::GetForProfile(
@@ skipping 22 matching lines @@
     *message = notification->message();
   }
 
 #if defined(OS_WIN)
   std::unique_ptr<display::Screen> test_screen_;
 #endif
   std::unique_ptr<TestingProfileManager> profile_manager_;
   std::unique_ptr<TestingProfile> profile_;
   SigninErrorController* error_controller_;
   NotificationUIManager* notification_ui_manager_;
-#if defined(OS_CHROMEOS)
-  chromeos::MockUserManager* mock_user_manager_;  // Not owned.
-  std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
-#endif
 };
 
 TEST_F(SigninErrorNotifierTest, NoErrorAuthStatusProviders) {
   ASSERT_FALSE(notification_ui_manager_->FindById(
       kNotificationId, NotificationUIManager::GetProfileID(profile_.get())));
   {
     // Add a provider (removes itself on exiting this scope).
     FakeAuthStatusProvider provider(error_controller_);
     ASSERT_FALSE(notification_ui_manager_->FindById(
         kNotificationId, NotificationUIManager::GetProfileID(profile_.get())));
@@ skipping 116 matching lines @@
       EXPECT_FALSE(notification->title().empty());
       EXPECT_FALSE(notification->message().empty());
       EXPECT_EQ((size_t)1, notification->buttons().size());
     }
   }
 }
 #endif
 
 }  // namespace test
 }  // namespace ash