Bug 40491: Don't auto-pick a v2 address when it's in Onion-Location header

We could do a more strict validation on the v3 host, if needed.

Also linted/formatted Document.cpp before applying the new patch.

Closes #40491 (closed).

dom/base/Document.cpp

@@ -17847,31 +17847,31 @@ ColorScheme Document::DefaultColorScheme() const {
 ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
   // tor-browser#27476
-  // should this document ignore resist finger-printing settings with regards to
-  // setting the color scheme
-  // currently only enabled for about:torconnect but we could expand to other
-  // non- SystemPrincipal pages if we wish
+  // Should this document ignore resist finger-printing settings with regards to
+  // setting the color scheme?
+  // Currently only enabled for about:torconnect but we could expand to other
+  // non-SystemPrincipal pages if we wish.
   const auto documentUsesPreferredColorScheme =
       [](auto const* constDocument) -> bool {
     if (auto* document = const_cast<Document*>(constDocument);
         document != nullptr) {
       auto uri = document->GetDocBaseURI();
-      // try and extract out our prepath and filepath portions of the uri to
-      // C-strings
+      // Try and extract out our prepath and filepath portions of the uri to
+      // C-strings.
       nsAutoCString prePathStr, filePathStr;
       if (NS_FAILED(uri->GetPrePath(prePathStr)) ||
           NS_FAILED(uri->GetFilePath(filePathStr))) {
         return false;
       }
-      // stick them in string view for easy comparisons
+      // Stick them in string view for easy comparisons
       std::string_view prePath(prePathStr.get(), prePathStr.Length()),
           filePath(filePathStr.get(), filePathStr.Length());
-      // these about URIs will have the user's preferred color scheme exposed to
-      // them we can place other URIs here in the future if we wish see
-      // nsIURI.idl for URI part definitions
+      // These about URIs will have the user's preferred color scheme exposed to
+      // them we can place other URIs here in the future if we wish.
+      // See nsIURI.idl for URI part definitions
       constexpr struct {
         std::string_view prePath;
         std::string_view filePath;
@@ -17879,17 +17879,17 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const {
           {"about:", "torconnect"},
       };
-      // check each uri in the allow list against this document's uri
-      // verify the prepath and the file path match
+      // Check each uri in the allow list against this document's URI.
+      // Verify the prepath and the file path match
       for (auto const& uri : allowedURIs) {
         if (prePath == uri.prePath && filePath == uri.filePath) {
-          // positive match means we can apply dark-mode to the page
+          // Positive match means we can apply dark-mode to the page
           return true;
         }
       }
     }
-    // do not allow if no match or other error
+    // Do not allow if no match or other error
     return false;
   };