Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1442)

Unified Diff: chrome/browser/notifications/notification_interactive_uitest_support.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: rebased Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/notifications/notification_interactive_uitest_support.cc
diff --git a/chrome/browser/notifications/notification_interactive_uitest_support.cc b/chrome/browser/notifications/notification_interactive_uitest_support.cc
index 4d8e157cc56ec9392be0284a5c91c414138e511f..4a71efed6bd8ecbdab2db0a0f3b9d82ab46464a4 100644
--- a/chrome/browser/notifications/notification_interactive_uitest_support.cc
+++ b/chrome/browser/notifications/notification_interactive_uitest_support.cc
@@ -15,6 +15,7 @@
#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"
@@ -268,10 +269,12 @@ void NotificationsTest::GetPrefsByContentSetting(
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;
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698