Fix some merge issues from merge of 66690 (r66830) and 66933 (r66934)

chrome/browser/browser_init.cc

Index: chrome/browser/browser_init.cc
===================================================================
--- chrome/browser/browser_init.cc	(revision 67904)
+++ chrome/browser/browser_init.cc	(working copy)
@@ -868,7 +868,12 @@
             ChildProcessSecurityPolicy::GetInstance();
         if (policy->IsWebSafeScheme(url.scheme()) ||
             url.SchemeIs(chrome::kFileScheme) ||
-            !url.spec().compare(chrome::kAboutBlankURL)) {
+#if defined(OS_CHROMEOS)
+            // In ChromeOS, allow a settings page to be specified on the
+            // command line. See ExistingUserController::OnLoginSuccess.
+            (url.spec().find(chrome::kChromeUISettingsURL) == 0) ||
+#endif
+            (url.spec().compare(chrome::kAboutBlankURL) == 0)) {
           urls.push_back(url);
         }
       }