[Reland] GetAccountIdFromProfile() should not return an empty account id if a valid profile is prov…

chrome/browser/sync/sync_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/sync/sync_error_notifier_ash.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 16 matching lines @@
 #include "testing/gmock/include/gmock/gmock.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
+
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::_;
 
 namespace ash {
 namespace test {
 
 namespace {
 
@@ skipping 130 matching lines @@
 
 // Test that SyncErrorNotifier shows an notification if a passphrase is
 // required.
 // Disabled on Windows: http://crbug.com/373238
 #if defined(OS_WIN)
 #define MAYBE_PassphraseNotification DISABLED_PassphraseNotification
 #else
 #define MAYBE_PassphraseNotification PassphraseNotification
 #endif
 TEST_F(SyncErrorNotifierTest, MAYBE_PassphraseNotification) {
+#if defined(OS_CHROMEOS)
+  chromeos::ScopedUserManagerEnabler scoped_enabler(
+      new chromeos::MockUserManager());
+#endif
   ASSERT_FALSE(notification_ui_manager_->FindById(
       kNotificationId, NotificationUIManager::GetProfileID(profile_)));
 
   browser_sync::SyncBackendHost::Status status;
   EXPECT_CALL(*service_, QueryDetailedSyncStatus(_))
               .WillRepeatedly(Return(false));
 
   EXPECT_CALL(*service_, IsPassphraseRequired())
               .WillRepeatedly(Return(true));
   EXPECT_CALL(*service_, IsPassphraseRequiredForDecryption())
@@ skipping 26 matching lines @@
     SCOPED_TRACE("Not expecting notification since sync setup is incomplete");
     VerifySyncErrorNotifierResult(
         GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
         false /* not signed in */,
         false /* no error */);
   }
 }
 
 }  // namespace test
 }  // namespace ash