From c56ed77cf95003e41a38f8fb458da15fcbdb5755 Mon Sep 17 00:00:00 2001
From: Brian Clifton <brian@clifton.me>
Date: Wed, 4 Mar 2020 21:59:19 -0700
Subject: [PATCH] Revert the disabling of WebSQL after finding extension
 breakage

Speed dial extension was affected; may impact others too.

Fixes https://github.com/brave/brave-browser/issues/8542

-----

Revert "Merge pull request #4463 from brave/disable_websql"

This reverts commit a50fa1df5d6afd637fde55a0026d81c364ae92b5, reversing
changes made to cd4edd37b8b121b4aa5f1c51060e39ebbae8096d.
---
 app/brave_main_delegate.cc             |  2 --
 app/brave_main_delegate_browsertest.cc |  6 ----
 app/websql_browsertest.cc              | 43 --------------------------
 test/BUILD.gn                          |  1 -
 4 files changed, 52 deletions(-)
 delete mode 100644 app/websql_browsertest.cc

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index 4a0cc37fd2c..b426097574b 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -152,8 +152,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
   command_line.AppendSwitchASCII(switches::kSyncServiceURL,
                                  "https://no-thanks.invalid");
 
-  command_line.AppendSwitch(switches::kDisableDatabases);
-
   // Enabled features.
   const std::unordered_set<const char*> enabled_features = {
     // Upgrade all mixed content
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index 2800fd6e810..d120c127c3c 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -15,7 +15,6 @@
 #include "components/password_manager/core/common/password_manager_features.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_features.h"
-#include "content/public/common/content_switches.h"
 #include "content/public/common/web_preferences.h"
 #include "gpu/config/gpu_finch_features.h"
 #include "services/network/public/cpp/features.h"
@@ -40,11 +39,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisableHyperlinkAuditing) {
   EXPECT_FALSE(prefs.hyperlink_auditing_enabled);
 }
 
-IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisableWebSQL) {
-  EXPECT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableDatabases));
-}
-
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
       &autofill::features::kAutofillServerCommunication,
diff --git a/app/websql_browsertest.cc b/app/websql_browsertest.cc
deleted file mode 100644
index 5874e3199da..00000000000
--- a/app/websql_browsertest.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (c) 2019 The Brave Authors. All rights reserved.
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "base/path_service.h"
-#include "brave/common/brave_paths.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/common/content_switches.h"
-#include "content/public/test/browser_test_utils.h"
-
-class WebSQLDisabledTest : public InProcessBrowserTest {
- public:
-  void SetUpOnMainThread() override {
-    InProcessBrowserTest::SetUpOnMainThread();
-    content::SetupCrossSiteRedirector(embedded_test_server());
-
-    brave::RegisterPathProvider();
-    base::FilePath test_data_dir;
-    base::PathService::Get(brave::DIR_TEST_DATA, &test_data_dir);
-    embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
-
-    ASSERT_TRUE(embedded_test_server()->Start());
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(WebSQLDisabledTest, IsDisabled) {
-  GURL url = embedded_test_server()->GetURL("/simple.html");
-  ui_test_utils::NavigateToURL(browser(), url);
-  content::WebContents* contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  ASSERT_TRUE(content::WaitForLoadStop(contents));
-  EXPECT_EQ(url, contents->GetURL());
-
-  bool websql_blocked;
-  ASSERT_TRUE(ExecuteScriptAndExtractBool(
-      contents,
-      "window.domAutomationController.send(window.openDatabase == undefined)",
-      &websql_blocked));
-  EXPECT_TRUE(websql_blocked);
-}
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 99f037007c9..0dd1f14310a 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -524,7 +524,6 @@ test("brave_browser_tests") {
   testonly = true
   sources = [
     "//brave/app/brave_main_delegate_browsertest.cc",
-    "//brave/app/websql_browsertest.cc",
     "//brave/browser/autocomplete/brave_autocomplete_provider_client_browsertest.cc",
     "//brave/browser/brave_scheme_load_browsertest.cc",
     "//brave/browser/autoplay/autoplay_permission_context_browsertest.cc",