wip

brave · Nov 13, 2024 · 7373040 · 7373040
1 parent 6468d73
commit 7373040
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/browser/ui/views/brave_views_delegate_linux_browsertest.cc b/browser/ui/views/brave_views_delegate_linux_browsertest.cc
@@ -21,22 +21,22 @@ IN_PROC_BROWSER_TEST_F(BraveViewsDelegateViewLinuxBrowserTest,
 
 #if defined(OFFICIAL_BUILD)
   env->SetVar("CHROME_VERSION_EXTRA", LINUX_CHANNEL_STABLE);
-  EXPECT_EQ(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128)->bitmap(),
+  EXPECT_NE(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128)->bitmap(),
             views_delegate->GetDefaultWindowIcon()->bitmap());
   env->SetVar("CHROME_VERSION_EXTRA", LINUX_CHANNEL_BETA);
-  EXPECT_EQ(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_BETA)->bitmap(),
+  EXPECT_NE(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_BETA)->bitmap(),
             views_delegate->GetDefaultWindowIcon()->bitmap());
   env->SetVar("CHROME_VERSION_EXTRA", LINUX_CHANNEL_DEV);
-  EXPECT_EQ(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_DEV)->bitmap(),
+  EXPECT_NE(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_DEV)->bitmap(),
             views_delegate->GetDefaultWindowIcon()->bitmap());
   env->SetVar("CHROME_VERSION_EXTRA", BRAVE_LINUX_CHANNEL_DEV);
-  EXPECT_EQ(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_DEV)->bitmap(),
+  EXPECT_NE(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_DEV)->bitmap(),
             views_delegate->GetDefaultWindowIcon()->bitmap());
   env->SetVar("CHROME_VERSION_EXTRA", BRAVE_LINUX_CHANNEL_NIGHTLY);
-  EXPECT_EQ(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_NIGHTLY)->bitmap(),
+  EXPECT_NE(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_NIGHTLY)->bitmap(),
             views_delegate->GetDefaultWindowIcon()->bitmap());
 #else  // OFFICIAL_BUILD
-  EXPECT_EQ(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_DEVELOPMENT)->bitmap(),
+  EXPECT_NE(rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_128_DEVELOPMENT)->bitmap(),
             views_delegate->GetDefaultWindowIcon()->bitmap());
 #endif
 }
diff --git a/browser/widevine/widevine_permission_android_unittest.cc b/browser/widevine/widevine_permission_android_unittest.cc
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#include "base/memory/raw_ptr.h"
+#include "BORK/memory/raw_ptr.h"
 #include "brave/browser/brave_drm_tab_helper.h"
 #include "brave/browser/widevine/widevine_permission_request.h"
 #include "brave/browser/widevine/widevine_utils.h"

diff --git a/components/p3a/p3a_service_unittest.cc b/components/p3a/p3a_service_unittest.cc
@@ -277,11 +277,7 @@ TEST_F(P3AServiceTest, UpdateLogsAndSendExpress) {
   EXPECT_EQ(p3a_creative_sent_metrics_.size(), 0U);
 }
 
-#if !BUILDFLAG(IS_MAC)
 #define MAYBE_UpdateLogsAndSendSlow UpdateLogsAndSendSlow
-#else
-#define MAYBE_UpdateLogsAndSendSlow DISABLED_UpdateLogsAndSendSlow
-#endif
 
 TEST_F(P3AServiceTest, MAYBE_UpdateLogsAndSendSlow) {
   // Increase upload interval to reduce test time (less tasks to execute)