cefsimple: Enable Chrome runtime by default (see #3685)

Run with `--disable-chrome-runtime` to use the Alloy runtime.

tests/cefclient/browser/client_browser.cc

@@ -69,6 +69,7 @@ class ClientBrowserDelegate : public ClientAppBrowser::Delegate {
     // Add logging for some common switches that the user may attempt to use.
     static const char* kIgnoredSwitches[] = {
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
+        switches::kDisableChromeRuntime,
         switches::kEnableChromeRuntime,
 #endif
         switches::kMultiThreadedMessageLoop,

tests/cefclient/browser/main_context_impl.cc

@@ -79,7 +79,7 @@ MainContextImpl::MainContextImpl(CefRefPtr<CefCommandLine> command_line,
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
   // Enable Chrome runtime bootstrap. See issue #2969 for details.
   use_chrome_bootstrap_ =
-      command_line_->HasSwitch(switches::kEnableChromeRuntime);
+      !command_line_->HasSwitch(switches::kDisableChromeRuntime);
 #endif
 
   // Whether the Views framework will be used.

tests/cefsimple/cefsimple_linux.cc

@@ -59,13 +59,11 @@ int main(int argc, char* argv[]) {
   CefSettings settings;
 
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
-  // Use the CEF Chrome runtime if "--enable-chrome-runtime" is specified via
+  // Use the CEF Chrome bootstrap unless "--disable-chrome-runtime" is specified
-  // the command-line. Otherwise, use the CEF Alloy runtime. For more
+  // via the command-line. Otherwise, use the CEF Alloy bootstrap. The Alloy
-  // information about CEF runtimes see
+  // bootstrap is deprecated and will be removed in ~M127. See
-  // https://bitbucket.org/chromiumembedded/cef/wiki/Architecture.md#markdown-header-cef3
+  // https://github.com/chromiumembedded/cef/issues/3685
-  if (command_line->HasSwitch("enable-chrome-runtime")) {
+  settings.chrome_runtime = !command_line->HasSwitch("disable-chrome-runtime");
-    settings.chrome_runtime = true;
-  }
 #endif
 
 // When generating projects with CMake the CEF_USE_SANDBOX value will be defined

tests/cefsimple/cefsimple_mac.mm

@@ -151,13 +151,12 @@ int main(int argc, char* argv[]) {
     CefSettings settings;
 
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
-    // Use the CEF Chrome runtime if "--enable-chrome-runtime" is specified via
+    // Use the CEF Chrome bootstrap unless "--disable-chrome-runtime" is
-    // the command-line. Otherwise, use the CEF Alloy runtime. For more
+    // specified via the command-line. Otherwise, use the CEF Alloy bootstrap.
-    // information about CEF runtimes see
+    // The Alloy bootstrap is deprecated and will be removed in ~M127. See
-    // https://bitbucket.org/chromiumembedded/cef/wiki/Architecture.md#markdown-header-cef3
+    // https://github.com/chromiumembedded/cef/issues/3685
-    if (command_line->HasSwitch("enable-chrome-runtime")) {
+    settings.chrome_runtime =
-      settings.chrome_runtime = true;
+        !command_line->HasSwitch("disable-chrome-runtime");
-    }
 #endif
 
     // When generating projects with CMake the CEF_USE_SANDBOX value will be

tests/cefsimple/cefsimple_win.cc

@@ -75,13 +75,11 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
   CefSettings settings;
 
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
-  // Use the CEF Chrome runtime if "--enable-chrome-runtime" is specified via
+  // Use the CEF Chrome bootstrap unless "--disable-chrome-runtime" is specified
-  // the command-line. Otherwise, use the CEF Alloy runtime. For more
+  // via the command-line. Otherwise, use the CEF Alloy bootstrap. The Alloy
-  // information about CEF runtimes see
+  // bootstrap is deprecated and will be removed in ~M127. See
-  // https://bitbucket.org/chromiumembedded/cef/wiki/Architecture.md#markdown-header-cef3
+  // https://github.com/chromiumembedded/cef/issues/3685
-  if (command_line->HasSwitch("enable-chrome-runtime")) {
+  settings.chrome_runtime = !command_line->HasSwitch("disable-chrome-runtime");
-    settings.chrome_runtime = true;
-  }
 #endif
 
 #if !defined(CEF_USE_SANDBOX)

tests/cefsimple/simple_app.cc

@@ -113,12 +113,17 @@ void SimpleApp::OnContextInitialized() {
   CefRefPtr<CefCommandLine> command_line =
       CefCommandLine::GetGlobalCommandLine();
 
+#if !defined(DISABLE_ALLOY_BOOTSTRAP)
+  const bool enable_chrome_runtime =
+      !command_line->HasSwitch("disable-chrome-runtime");
+#endif
+
   // Check if Alloy style will be used. Alloy style is always used with the
   // Alloy runtime bootstrap and optional with the Chrome runtime bootstrap.
   bool use_alloy_style = true;
   cef_runtime_style_t runtime_style = CEF_RUNTIME_STYLE_DEFAULT;
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
-  if (command_line->HasSwitch("enable-chrome-runtime"))
+  if (enable_chrome_runtime)
 #endif
   {
     use_alloy_style = command_line->HasSwitch("use-alloy-style");
@@ -142,10 +147,20 @@ void SimpleApp::OnContextInitialized() {
     url = "http://www.google.com";
   }
 
-  // Create the browser using the Views framework if "--use-views" is specified
+  // Views is enabled by default with the Chrome bootstrap (add `--use-native`
-  // via the command-line. Otherwise, create the browser using the native
+  // to disable). Views is disabled by default with the Alloy bootstrap (add
-  // platform framework.
+  // `--use-views` to enable).
-  if (command_line->HasSwitch("use-views")) {
+#if !defined(DISABLE_ALLOY_BOOTSTRAP)
+  const bool use_views =
+      (enable_chrome_runtime && !command_line->HasSwitch("use-native")) ||
+      (!enable_chrome_runtime && command_line->HasSwitch("use-views"));
+#else
+  const bool use_views = !command_line->HasSwitch("use-native");
+#endif
+
+  // If using Views create the browser using the Views framework, otherwise
+  // create the browser using the native platform framework.
+  if (use_views) {
     // Create the BrowserView.
     CefRefPtr<CefBrowserView> browser_view = CefBrowserView::CreateBrowserView(
         handler, url, browser_settings, nullptr, nullptr,

tests/shared/common/client_switches.cc

@@ -45,6 +45,7 @@ const char kSslClientCertificate[] = "ssl-client-certificate";
 const char kCRLSetsPath[] = "crl-sets-path";
 const char kNoActivate[] = "no-activate";
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
+const char kDisableChromeRuntime[] = "disable-chrome-runtime";
 const char kEnableChromeRuntime[] = "enable-chrome-runtime";
 #endif
 const char kShowChromeToolbar[] = "show-chrome-toolbar";

tests/shared/common/client_switches.h

@@ -39,6 +39,7 @@ extern const char kSslClientCertificate[];
 extern const char kCRLSetsPath[];
 extern const char kNoActivate[];
 #if !defined(DISABLE_ALLOY_BOOTSTRAP)
+extern const char kDisableChromeRuntime[];
 extern const char kEnableChromeRuntime[];
 #endif
 extern const char kShowChromeToolbar[];