diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc index 15d46dc40629..2f7f24189243 100644 --- a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2020-07-07 21:58:14 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2020-11-13 06:36:38 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -77,6 +77,10 @@ +@@ -78,6 +78,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,30 +11,21 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -105,7 +109,7 @@ - #include "ui/events/test/event_generator.h" - #endif // defined(OS_CHROMEOS) - --#if !defined(OS_CHROMEOS) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) - #include "ui/views/test/test_desktop_screen_x11.h" - #endif - -@@ -282,7 +286,7 @@ void InProcessBrowserTest::SetUp() { +@@ -288,7 +292,7 @@ void InProcessBrowserTest::SetUp() { // Cookies). Without this on Mac and Linux, many tests will hang waiting for a // user to approve KeyChain/kwallet access. On Windows this is not needed as // OS APIs never block. --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) OSCryptMocker::SetUp(); #endif -@@ -344,7 +348,7 @@ void InProcessBrowserTest::TearDown() { +@@ -348,7 +352,7 @@ void InProcessBrowserTest::TearDown() { com_initializer_.reset(); #endif BrowserTestBase::TearDown(); --#if defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) OSCryptMocker::TearDown(); #endif |