diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc index 4e44716a40f3..1eb4731da1cf 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -359,7 +359,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, content::NotificationService::AllSources()); - if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty()) + if (!user_data_dir_.empty() && ProfileShortcutManager::IsFeatureEnabled()) profile_shortcut_manager_ = ProfileShortcutManager::Create(this); } diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h index 7d02af7f8f60..eb70e533dbfb 100644 --- chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h @@ -99,7 +99,7 @@ class ProfileManager : public content::NotificationObserver, // acceptable. Returns null if creation of the new profile fails. // TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then // make this method private. - Profile* GetProfile(const base::FilePath& profile_dir); + virtual Profile* GetProfile(const base::FilePath& profile_dir); // Returns total number of profiles available on this machine. size_t GetNumberOfProfiles(); @@ -129,7 +129,7 @@ class ProfileManager : public content::NotificationObserver, // Returns true if the profile pointer is known to point to an existing // profile. - bool IsValidProfile(const void* profile); + virtual bool IsValidProfile(const void* profile); // Returns the directory where the first created profile is stored, // relative to the user data directory currently in use. @@ -138,7 +138,7 @@ class ProfileManager : public content::NotificationObserver, // Get the Profile last used (the Profile to which owns the most recently // focused window) with this Chrome build. If no signed profile has been // stored in Local State, hand back the Default profile. - Profile* GetLastUsedProfile(const base::FilePath& user_data_dir); + virtual Profile* GetLastUsedProfile(const base::FilePath& user_data_dir); // Get the path of the last used profile, or if that's undefined, the default // profile. diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc index 07e6f8d726df..9a3c6b38b8eb 100644 --- chrome/browser/profiles/renderer_updater.cc +++ chrome/browser/profiles/renderer_updater.cc @@ -7,6 +7,7 @@ #include #include "base/bind.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h" @@ -67,8 +68,12 @@ void GetGuestViewDefaultContentSettingRules( RendererUpdater::RendererUpdater(Profile* profile) : profile_(profile), identity_manager_observer_(this) { +#if !BUILDFLAG(ENABLE_CEF) identity_manager_ = IdentityManagerFactory::GetForProfile(profile); identity_manager_observer_.Add(identity_manager_); +#else + identity_manager_ = nullptr; +#endif #if defined(OS_CHROMEOS) oauth2_login_manager_ = chromeos::OAuth2LoginManagerFactory::GetForProfile(profile_); @@ -238,7 +243,7 @@ void RendererUpdater::UpdateRenderer( force_google_safesearch_.GetValue(), force_youtube_restrict_.GetValue(), allowed_domains_for_apps_.GetValue(), - identity_manager_->HasPrimaryAccount() + identity_manager_ && identity_manager_->HasPrimaryAccount() ? cached_variation_ids_header_signed_in_ : cached_variation_ids_header_)); }