Skip to content

Commit

Permalink
Revert "Merge pull request #9849 from brave/cr93_first_run_regression"
Browse files Browse the repository at this point in the history
This reverts commit 0b78f9e, reversing
changes made to d260b6a.

Reverting because upstream has fixed the first run regression via:

https://chromium.googlesource.com/chromium/src.git/+/f9385e0d893916cbb16b477bdec127e56f9897da

Cherry-picked into cr94 as
https://chromium.googlesource.com/chromium/src/+/3f20e2edeb0adf78a6a9a6208e2e02ad3c7d8810

commit f9385e0d893916cbb16b477bdec127e56f9897da
Author: Caitlin Fischer <caitlinfischer@google.com>
Date:   Mon Aug 30 13:31:02 2021 +0000

    Ignore Local State when deciding whether to show the first run dialog.

    The bug was caused by an experiment that causes Local State to be
    written to disk during startup (before the first-run-dialog-showing
    logic is reached) on some clients. Since Local State existed on some
    clients, the dialog was not shown. However, the first-run-dialog-showing
    logic should not depend on the presence or absence of a Local State
    file.

    This change affects some POSIX platforms running Google Chrome for the
    first time. This logic being removed was originally added here:
    https://chromiumcodereview.appspot.com/14946003/.

    Bug: 1221483
  • Loading branch information
mkarolin committed Sep 9, 2021
1 parent 7a08df3 commit 9dbfc2d
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@
#if defined(OFFICIAL_BUILD)
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
#define BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING() (1)
#define FILE_LOCAL_STATE PATH_END
#endif
#include "../../../../../chrome/browser/first_run/first_run_internal_posix.cc"
#if defined(OFFICIAL_BUILD)
#undef BUILDFLAG_INTERNAL_GOOGLE_CHROME_BRANDING
#undef FILE_LOCAL_STATE
#endif
15 changes: 0 additions & 15 deletions common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -185,21 +185,6 @@ config("constants_configs") {
}
}

source_set("unit_tests") {
testonly = true

if (!is_ios) {
sources = [ "brave_paths_unittest.cc" ]

deps = [
"//base",
"//brave/common",
"//chrome/common",
"//testing/gtest",
]
}
}

mojom("mojo_bindings") {
sources = [ "brave_renderer_configuration.mojom" ]

Expand Down
16 changes: 0 additions & 16 deletions common/brave_paths_unittest.cc

This file was deleted.

1 change: 0 additions & 1 deletion test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ test("brave_unit_tests") {
"//brave/chromium_src/components/autofill_assistant/browser:unit_tests",
"//brave/common:network_constants",
"//brave/common:pref_names",
"//brave/common:unit_tests",
"//brave/components/adblock_rust_ffi",
"//brave/components/brave_adaptive_captcha/buildflags",
"//brave/components/brave_ads/test:brave_ads_unit_tests",
Expand Down

0 comments on commit 9dbfc2d

Please sign in to comment.