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

chrome/browser/chromeos/profiles/profile_helper.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 15 matching lines @@
 namespace extensions {
 class ExtensionGarbageCollectorChromeOSUnitTest;
 }
 
 namespace ash {
 namespace test {
 class MultiUserWindowManagerChromeOSTest;
 }  // namespace test
 }  // namespace ash
 
+namespace test {
+class BrowserFinderChromeOSTest;
+}  // namespace test
+
 namespace chromeos {
 
 class FileFlusher;
 
 // This helper class is used on Chrome OS to keep track of currently
 // active user profile.
 // Whenever active user is changed (either add another user into session or
 // switch between users), ActiveUserHashChanged() will be called thus
 // internal state |active_user_id_hash_| will be updated.
 // Typical use cases for using this class:
@@ skipping 102 matching lines @@
   friend class FakeChromeUserManager;
   friend class KioskTest;
   friend class MockUserManager;
   friend class MultiProfileUserControllerTest;
   friend class PrinterDetectorAppSearchEnabledTest;
   friend class ProfileHelperTest;
   friend class ProfileListChromeOSTest;
   friend class SessionStateDelegateChromeOSTest;
   friend class SystemTrayDelegateChromeOSTest;
   friend class ash::test::MultiUserWindowManagerChromeOSTest;
+  friend class ::test::BrowserFinderChromeOSTest;
 
   // Called when signin profile is cleared.
   void OnSigninProfileCleared();
 
   // BrowsingDataRemover::Observer implementation:
   void OnBrowsingDataRemoverDone() override;
 
   // OAuth2LoginManager::Observer overrides.
   void OnSessionRestoreStateChanged(
       Profile* user_profile,
@@ skipping 50 matching lines @@
   std::unique_ptr<FileFlusher> profile_flusher_;
 
   base::WeakPtrFactory<ProfileHelper> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileHelper);
 };
 
 } // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_