Site Settings Desktop: Support adding exceptions for incognito mode.

chrome/test/base/testing_profile.cc

 // Copyright (c) 2012 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/test/base/testing_profile.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 670 matching lines @@
     return INCOGNITO_PROFILE;
   return REGULAR_PROFILE;
 }
 
 bool TestingProfile::IsOffTheRecord() const {
   return force_incognito_ || original_profile_;
 }
 
 void TestingProfile::SetOffTheRecordProfile(std::unique_ptr<Profile> profile) {
   DCHECK(!IsOffTheRecord());
-  DCHECK_EQ(this, profile->GetOriginalProfile());
+  if (profile)
+    DCHECK_EQ(this, profile->GetOriginalProfile());
   incognito_profile_ = std::move(profile);
 }
 
 Profile* TestingProfile::GetOffTheRecordProfile() {
   if (IsOffTheRecord())
     return this;
   if (!incognito_profile_)
     TestingProfile::Builder().BuildIncognito(this);
   return incognito_profile_.get();
 }
@@ skipping 158 matching lines @@
   return guest_view::GuestViewManager::FromBrowserContext(this);
 #else
   return NULL;
 #endif
 }
 
 content::PushMessagingService* TestingProfile::GetPushMessagingService() {
   return NULL;
 }
 
-bool TestingProfile::IsSameProfile(Profile *p) {
-  return this == p;
+bool TestingProfile::IsSameProfile(Profile *profile) {
+  if (this == profile)
+    return true;
+  Profile* otr_profile = incognito_profile_.get();
+  return otr_profile && profile == otr_profile;
 }
 
 base::Time TestingProfile::GetStartTime() const {
   return start_time_;
 }
 
 base::FilePath TestingProfile::last_selected_directory() {
   return last_selected_directory_;
 }
 
@@ skipping 187 matching lines @@
   // Note: Owned by |original_profile|.
   return new TestingProfile(path_, delegate_,
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             std::move(pref_service_), original_profile,
                             guest_session_, supervised_user_id_,
                             std::move(policy_service_), testing_factories_,
                             profile_name_);
 }