Update IsIncognitoProfile to return false for non-primary OTRs.

Profile::IsIncognitoProfile() currently returns true for incognito
profiles and also other non-Guest OTR profiles.

This behavior is updated so that it only returns true for incognito
profiles.

Bug: 1033903, 1074201
Change-Id: Ic2ce57b85a92534f0f6582c5c718b2947a899ff6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2124249Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772112}

chrome/browser/profiles/profile.cc

@@ -355,8 +355,7 @@ bool Profile::IsRegularProfile() const {
 }
 
 bool Profile::IsIncognitoProfile() const {
-  // TODO(https://crbug.com/1033903): Update to exclude non-primary OTRs.
-  return IsOffTheRecord() && !IsGuestSession();
+  return IsPrimaryOTRProfile() && !IsGuestSession();
 }
 
 bool Profile::IsGuestSession() const {
@@ -374,7 +373,7 @@ bool Profile::IsSystemProfile() const {
   return is_system_profile_;
 }
 
-bool Profile::IsPrimaryOTRProfile() {
+bool Profile::IsPrimaryOTRProfile() const {
   return IsOffTheRecord() && GetOTRProfileID() == OTRProfileID::PrimaryID();
 }
 

chrome/browser/profiles/profile.h

@@ -401,21 +401,18 @@ class Profile : public content::BrowserContext {
   // IsRegularProfile() and IsIncognitoProfile() are mutually exclusive.
   // IsSystemProfile() implies that IsRegularProfile() is true.
   // IsOffTheRecord() is true for the off the record profile of incognito mode
-  // and guest sessions.
+  // and guest sessions, and also non-primary OffTheRecord profiles.
 
   // Returns whether it's a regular profile.
   bool IsRegularProfile() const;
 
   // Returns whether it is an Incognito profile. An Incognito profile is an
-  // off-the-record profile that is not a guest profile.
-  //
-  // TODO(https://crbug.com/1033903): Update to return false for non-primary
-  // OTRs and update documentation above.
+  // off-the-record profile that is used for incognito mode.
   bool IsIncognitoProfile() const;
 
   // Returns true if this is a primary OffTheRecord profile, which covers the
   // OffTheRecord profile used for incognito mode and guest sessions.
-  virtual bool IsPrimaryOTRProfile();
+  bool IsPrimaryOTRProfile() const;
 
   // Returns whether it is a guest session. This covers both the guest profile
   // and its parent.

chrome/browser/profiles/profile_metrics.cc

@@ -185,13 +185,11 @@ profile_metrics::BrowserProfileType ProfileMetrics::GetBrowserProfileType(
   if (profile->IsRegularProfile())
     return profile_metrics::BrowserProfileType::kRegular;
 
-  // TODO(https://crrev.com/1033903): To be updated after updating
-  // |IsIncognitoProfile| to return false for non-primary OTR profiles.
-  if (profile->IsIncognitoProfile()) {
-    return profile->IsPrimaryOTRProfile()
-               ? profile_metrics::BrowserProfileType::kIncognito
-               : profile_metrics::BrowserProfileType::kOtherOffTheRecordProfile;
-  }
+  if (profile->IsIncognitoProfile())
+    return profile_metrics::BrowserProfileType::kIncognito;
+
+  if (profile->IsOffTheRecord() && !profile->IsPrimaryOTRProfile())
+    return profile_metrics::BrowserProfileType::kOtherOffTheRecordProfile;
 
   NOTREACHED();
   return profile_metrics::BrowserProfileType::kMaxValue;