Merge pull request #9849 from brave/cr93_first_run_regression

Fixed first-run dialog is not launched
brave · Aug 25, 2021 · 063da13 · 063da13
1 parent 9ce52e2
commit 063da13
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/chromium_src/chrome/browser/first_run/first_run_internal_posix.cc b/chromium_src/chrome/browser/first_run/first_run_internal_posix.cc
@@ -32,8 +32,10 @@
 #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
diff --git a/common/BUILD.gn b/common/BUILD.gn
@@ -185,6 +185,21 @@ 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" ]
 

diff --git a/common/brave_paths_unittest.cc b/common/brave_paths_unittest.cc
@@ -0,0 +1,16 @@
+/* Copyright (c) 2021 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 "brave/common/brave_paths.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
+#include "chrome/common/chrome_paths.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+TEST(BravePathsTest, PathTest) {
+  base::FilePath test_dir;
+  EXPECT_TRUE(base::PathService::Get(brave::DIR_TEST_DATA, &test_dir));
+  EXPECT_FALSE(base::PathService::Get(chrome::PATH_END, &test_dir));
+}
diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -168,6 +168,7 @@ 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_ads/test:brave_ads_unit_tests",
     "//brave/components/brave_component_updater/browser",