Commit ddf84e29 authored by Ghazale Hosseinabadi's avatar Ghazale Hosseinabadi Committed by Commit Bot

[Extensions] Fix flakiness of InspectInactiveServiceWorkerBackground.

This CL fixes the flakiness of DeveloperPrivateApiTest.
InspectInactiveServiceWorkerBackground.

Bug: 1134506
Change-Id: Iaba317d3995da20fda2548b00da6579db4b91059
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2458107Reviewed-by: default avatarDavid Bertoni <dbertoni@chromium.org>
Commit-Queue: Ghazale Hosseinabadi <ghazale@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815154}
parent 04fc553e
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "base/path_service.h" #include "base/path_service.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/devtools/devtools_window_testing.h" #include "chrome/browser/devtools/devtools_window_testing.h"
#include "chrome/browser/extensions/api/developer_private/developer_private_api.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
...@@ -138,18 +137,11 @@ IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, InspectEmbeddedOptionsPage) { ...@@ -138,18 +137,11 @@ IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, InspectEmbeddedOptionsPage) {
EXPECT_TRUE(DevToolsWindow::GetInstanceForInspectedWebContents(wc)); EXPECT_TRUE(DevToolsWindow::GetInstanceForInspectedWebContents(wc));
} }
// Crashes on Linux only. http://crbug.com/1134506
#if defined(OS_LINUX)
#define MAYBE_InspectInactiveServiceWorkerBackground \
DISABLED_InspectInactiveServiceWorkerBackground
#else
#define MAYBE_InspectInactiveServiceWorkerBackground \
InspectInactiveServiceWorkerBackground
#endif
IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest,
MAYBE_InspectInactiveServiceWorkerBackground) { InspectInactiveServiceWorkerBackground) {
ResultCatcher result_catcher; ResultCatcher result_catcher;
service_worker_test_utils::TestRegistrationObserver registration_observer(
browser()->profile());
// Load an extension that is service worker based. // Load an extension that is service worker based.
const Extension* extension = const Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("service_worker") LoadExtension(test_data_dir_.AppendASCII("service_worker")
...@@ -157,9 +149,6 @@ IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, ...@@ -157,9 +149,6 @@ IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest,
.AppendASCII("inspect")); .AppendASCII("inspect"));
ASSERT_TRUE(extension); ASSERT_TRUE(extension);
ASSERT_TRUE(result_catcher.GetNextResult()); ASSERT_TRUE(result_catcher.GetNextResult());
service_worker_test_utils::TestRegistrationObserver registration_observer(
browser()->profile());
registration_observer.WaitForRegistrationStored(); registration_observer.WaitForRegistrationStored();
// Stop the service worker. // Stop the service worker.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment