Bug 1566215 - Part 6: Undo the insecure URI loading exception for the Layout Debugger. r=dbaron

Differential Revision: https://phabricator.services.mozilla.com/D38416

docshell/base/moz.build

@@ -119,6 +119,3 @@ LOCAL_INCLUDES += [
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
-
-if CONFIG['MOZ_LAYOUT_DEBUGGER']:
-    DEFINES['MOZ_LAYOUT_DEBUGGER'] = True

docshell/base/nsDocShell.cpp

@@ -9608,18 +9608,6 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState,
           }
         }
       }
-#ifdef MOZ_LAYOUT_DEBUGGER
-      // Also allow loads in the layout debugger window.
-      nsCOMPtr<nsIDocShellTreeItem> rootItem;
-      GetRootTreeItem(getter_AddRefs(rootItem));
-      nsCOMPtr<nsIWebNavigation> root = do_QueryInterface(rootItem);
-      nsCOMPtr<nsIURI> rootURL;
-      root->GetCurrentURI(getter_AddRefs(rootURL));
-      if (rootURL && rootURL->GetSpecOrDefault().EqualsLiteral(
-                         "chrome://layoutdebug/content/layoutdebug.xul")) {
-        break;
-      }
-#endif
       // Final exception for some legacy automated tests:
       if (xpc::IsInAutomation() &&
           Preferences::GetBool("security.allow_unsafe_parent_loads", false)) {