Properly set default value for shields advanced view to FALSE.

Logic introduced with #3154 did properly set the value for first run, but the value didn't seem to be persisted to profile. When quitting and relaunching, it would evaluate and make default advanced (not simple).

Since all users have a value for this (and most of them have it advanced = true), it's safe to roll this out. New users will have simple view by default.

Fixes brave/brave-browser#8533

-----

Revert "Merge pull request #3154 from brave/bsc-shields-advanced-default-change"

This reverts commit 590da54, reversing
changes made to b295203.

Author: bsclifton

browser/brave_first_run_browsertest.cc

@@ -32,10 +32,6 @@
 #include "brave/components/brave_webtorrent/browser/webtorrent_util.h"
 #endif
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/first_run/first_run.h"
-#endif
-
 #if !BUILDFLAG(USE_GCM_FROM_PLATFORM)
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
 #endif
@@ -102,21 +98,14 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(kHTTPSEVerywhereControlType, true);
   registry->RegisterBooleanPref(kNoScriptControlType, false);
   registry->RegisterBooleanPref(kAdControlType, true);
-  // > advanced view is defaulted to true for EXISTING users; false for new
-  bool is_new_user = false;
-
-#if !defined(OS_ANDROID)
-  is_new_user = first_run::IsChromeFirstRun();
-#endif
 
 #if !BUILDFLAG(USE_GCM_FROM_PLATFORM)
   // PushMessaging
   registry->SetDefaultPrefValue(gcm::prefs::kGCMChannelStatus,
                                 base::Value(false));
 #endif
 
-  registry->RegisterBooleanPref(kShieldsAdvancedViewEnabled,
-                                is_new_user == false);
+  registry->RegisterBooleanPref(kShieldsAdvancedViewEnabled, false);
 
   // Google-oauth should work by default
   registry->RegisterBooleanPref(kGoogleLoginControlType, true);

browser/brave_first_run_browsertest.h

@@ -16,7 +16,6 @@
 #include "components/safe_browsing/common/safe_browsing_prefs.h"
 #include "components/spellcheck/browser/pref_names.h"
 #include "components/sync/base/pref_names.h"
-#include "brave/browser/brave_first_run_browsertest.h"
 
 #if !BUILDFLAG(USE_GCM_FROM_PLATFORM)
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
@@ -39,6 +38,9 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MiscBravePrefs) {
       kHTTPSEVerywhereControlType));
   EXPECT_FALSE(
       browser()->profile()->GetPrefs()->GetBoolean(kNoScriptControlType));
+  EXPECT_FALSE(
+      browser()->profile()->GetPrefs()->GetBoolean(
+        kShieldsAdvancedViewEnabled));
   EXPECT_TRUE(
       browser()->profile()->GetPrefs()->GetBoolean(kAdControlType));
   EXPECT_TRUE(
@@ -72,27 +74,6 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MiscBravePrefs) {
 #endif
 }
 
-// First run of Brave should default Shields to Simple view
-#if !defined(OS_ANDROID)
-const char kFirstRunEmptyPrefs[] = "{}";
-typedef FirstRunMasterPrefsBrowserTestT<kFirstRunEmptyPrefs>
-    BraveProfilePrefsFirstRunBrowserTest;
-IN_PROC_BROWSER_TEST_F(BraveProfilePrefsFirstRunBrowserTest,
-                       AdvancedShieldsNewUserValue) {
-  EXPECT_FALSE(
-        browser()->profile()->GetPrefs()->GetBoolean(
-          kShieldsAdvancedViewEnabled));
-}
-
-// Existing Brave users should default shields to Advanced view
-IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest,
-                       AdvancedShieldsExistingUserValue) {
-  EXPECT_TRUE(
-        browser()->profile()->GetPrefs()->GetBoolean(
-          kShieldsAdvancedViewEnabled));
-}
-#endif
-
 IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest,
                        DisableGoogleServicesByDefault) {
   EXPECT_FALSE(browser()->profile()->GetPrefs()->GetBoolean(

browser/brave_profile_prefs.cc

@@ -530,8 +530,6 @@ test("brave_browser_tests") {
     "//brave/browser/autoplay/autoplay_permission_context_browsertest.cc",
     "//brave/browser/brave_content_browser_client_browsertest.cc",
     "//brave/browser/brave_profile_prefs_browsertest.cc",
-    "//brave/browser/brave_first_run_browsertest.h",
-    "//brave/browser/brave_first_run_browsertest.cc",
     "//brave/browser/brave_local_state_browsertest.cc",
     "//brave/browser/brave_resources_browsertest.cc",
     "//brave/browser/brave_stats_updater_browsertest.cc",