MD Settings: Update Content Settings Types URLs.

chrome/browser/ui/webui/bidi_checker_web_ui_test.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/browser/ui/webui/bidi_checker_web_ui_test.h"
 
 #include "base/base_paths.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 352 matching lines @@
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsContentSettingsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kContentSettingsSubPage);
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsContentSettingsExceptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += std::string(chrome::kContentSettingsExceptionsSubPage);
+  url +=
+      std::string(chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage);
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsContentSettingsExceptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += std::string(chrome::kContentSettingsExceptionsSubPage);
+  url +=
+      std::string(chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage);
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsLanguageOptionsPage) {
   std::string url(chrome::kChromeUISettingsFrameURL);
   url += std::string(chrome::kLanguageOptionsSubPage);
   RunBidiCheckerOnPage(url);
 }
 
@@ skipping 72 matching lines @@
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#cookies
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsCookies) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#cookies";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsCookies) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#cookies";
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#images
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsImages) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#images";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsImages) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#images";
   RunBidiCheckerOnPage(url);
 }
 
 //======================================================
 // chrome://settings-frame/contentExceptions#javascript
 //======================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsJavascript) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#javascript";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsJavascript) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#javascript";
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#plugins
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsPlugins) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#plugins";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsPlugins) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#plugins";
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#popups
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsPopups) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#popups";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsPopups) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#popups";
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#location
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsLocation) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#location";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsLocation) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#location";
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#notifications
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsNotifications) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#notifications";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsNotifications) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#notifications";
   RunBidiCheckerOnPage(url);
 }
 
 //===================================================
 // chrome://settings-frame/contentExceptions#mouselock
 //===================================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameContentExceptionsMouseLock) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;
   url += "#mouselock";
   RunBidiCheckerOnPage(url);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestSettingsFrameContentExceptionsMouseLock) {
   std::string url(chrome::kChromeUISettingsFrameURL);
-  url += chrome::kContentSettingsExceptionsSubPage;
+  url += chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage;

[Dan Beam, 2016/10/27 23:44:41]

good job, Mario! but these tests are all DISABLED_

[tommycli, 2016/10/28 00:01:24]

Yeah... I still needed to change them to keep it correct in case these get
reenabled

   url += "#mouselock";
   RunBidiCheckerOnPage(url);
 }
 
 //========================================
 // chrome://settings-frame/handlers
 //========================================
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestSettingsFrameHandler) {
@@ skipping 109 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestLTR,
                        TestHistoryFrame) {
   RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
 }
 
 IN_PROC_BROWSER_TEST_F(DISABLED_WebUIBidiCheckerBrowserTestRTL,
                        TestHistoryFrame) {
   RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
 }