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

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

Issue 2699973002: MD Settings: enable by default in client (Closed)
Patch Set: disable cros Created 3 years, 10 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/platform_notification_service_interactive_uitest.cc
diff --git a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
index 6de0bdff3cc2d0a2f9fcf1888c3ed5fadc9bb885..f99ba225cd845fe62d10522596e8b8d3035b3139 100644
--- a/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
+++ b/chrome/browser/notifications/platform_notification_service_interactive_uitest.cc
@@ -7,6 +7,7 @@
#include <vector>
#include "base/command_line.h"
+#include "base/feature_list.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/strings/string_piece.h"
@@ -364,8 +365,12 @@ IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(content::WaitForLoadStop(web_contents));
- ASSERT_EQ("chrome://settings/contentExceptions#notifications",
- web_contents->GetLastCommittedURL().spec());
+
+ std::string url = web_contents->GetLastCommittedURL().spec();
+ if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings))
+ ASSERT_EQ("chrome://settings/content/notifications", url);
+ else
+ ASSERT_EQ("chrome://settings/contentExceptions#notifications", url);
}
IN_PROC_BROWSER_TEST_F(PlatformNotificationServiceBrowserTest,
« no previous file with comments | « chrome/browser/chrome_content_browser_client_browsertest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698