[chromedriver] Use disable-extensions-except on Windows and Mac.

chrome/test/chromedriver/chrome_launcher.cc

 // Copyright (c) 2013 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/test/chromedriver/chrome_launcher.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
@@ skipping 757 matching lines @@
     extension_paths.push_back(path.value());
     if (bg_page.length())
       bg_pages_tmp.push_back(bg_page);
   }
 
   if (include_automation_extension) {
     base::FilePath automation_extension;
     Status status = UnpackAutomationExtension(temp_dir, &automation_extension);
     if (status.IsError())
       return status;
-#if defined(OS_WIN) || defined(OS_MACOSX)
-    // On Chrome for Windows and Mac, a "Disable developer mode extensions"
-    // dialog appears for the automation extension. Suppress this by loading
-    // it as a component extension.
-    UpdateExtensionSwitch(switches, "load-component-extension",
-                          automation_extension.value());
-#else
     if (switches->HasSwitch("disable-extensions")) {
-      // For Chrome 56 and earlier:
+      UpdateExtensionSwitch(switches, "disable-extensions-except",
+                            automation_extension.value());
+      // TODO(samuong): Stop using --load-component-extension when ChromeDriver
+      // stops supporting Chrome 56. For backwards compatibility, Chrome 57 and
+      // 58 interprets --load-component-extension as --load-extension.
       UpdateExtensionSwitch(switches, "load-component-extension",
                             automation_extension.value());
-      // For Chrome 57 and later:
-      UpdateExtensionSwitch(switches, "disable-extensions-except",
+    } else {
+#if defined(OS_WIN) || defined(OS_MACOSX)
+      // On Chrome 56 for Windows and Mac, a "Disable developer
+      // mode extensions" dialog appears for the automation extension. Suppress
+      // this by loading it as a component extension.
+      UpdateExtensionSwitch(switches, "load-component-extension",
                             automation_extension.value());
-    } else {
+#else
       extension_paths.push_back(automation_extension.value());
+#endif
     }
-#endif
   }
 
   if (extension_paths.size()) {
     base::FilePath::StringType extension_paths_value = base::JoinString(
         extension_paths, base::FilePath::StringType(1, ','));
     UpdateExtensionSwitch(switches, "load-extension", extension_paths_value);
   }
   bg_pages->swap(bg_pages_tmp);
   return Status(kOk);
 }
@@ skipping 74 matching lines @@
   // Write empty "First Run" file, otherwise Chrome will wipe the default
   // profile that was written.
   if (base::WriteFile(
           user_data_dir.Append(chrome::kFirstRunSentinel), "", 0) != 0) {
     return Status(kUnknownError, "failed to write first run file");
   }
   return Status(kOk);
 }
 
 }  // namespace internal