Store base::Value in ContentSettingPatternSource instead of an enum

chrome/browser/notifications/notification_interactive_uitest_support.cc

 // Copyright 2017 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/notifications/notification_interactive_uitest_support.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/notifications/web_notification_delegate.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/content_settings/core/common/content_settings.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_observer.h"
 
 namespace {
 
 // Used to observe the creation of permission prompt without responding.
 class PermissionRequestObserver : public PermissionRequestManager::Observer {
  public:
@@ skipping 234 matching lines @@
   return observer.Wait();
 }
 
 void NotificationsTest::GetPrefsByContentSetting(
     ContentSetting setting,
     ContentSettingsForOneType* settings) {
   DesktopNotificationProfileUtil::GetNotificationsSettings(browser()->profile(),
                                                            settings);
   for (ContentSettingsForOneType::iterator it = settings->begin();
        it != settings->end();) {
-    if (it->setting != setting || it->source.compare("preference") != 0)
+    if (it->GetContentSetting() != setting ||
+        it->source.compare("preference") != 0) {
       it = settings->erase(it);
-    else
+    } else {
       ++it;
+    }
   }
 }
 
 bool NotificationsTest::CheckOriginInSetting(
     const ContentSettingsForOneType& settings,
     const GURL& origin) {
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromURLNoWildcard(origin);
   for (const auto& setting : settings) {
     if (setting.primary_pattern == pattern)
@@ skipping 44 matching lines @@
 #else
   feature_list_.InitWithFeatures(
       {features::kPreferHtmlOverPlugins},
       {features::kAllowFullscreenWebNotificationsFeature});
 #endif  // BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS)
 }
 
 void NotificationsTest::DropOriginPreference(const GURL& origin) {
   DesktopNotificationProfileUtil::ClearSetting(browser()->profile(), origin);
 }