Commit c5aec3ce authored by Tsuyoshi Horo's avatar Tsuyoshi Horo Committed by Commit Bot

Disable DeclarativeNetRequestBrowserTest.BlockRequests_UrlFilter on win dbg

TBR=karandeepb@chromium.org

Bug: 900447,696822
Change-Id: I963f072f0c43f644e18fd29adc9d1784ea6b28e7
Reviewed-on: https://chromium-review.googlesource.com/c/1309376
Commit-Queue: Tsuyoshi Horo <horo@chromium.org>
Reviewed-by: default avatarTsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604142}
parent af2c7753
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "base/threading/thread_restrictions.h" #include "base/threading/thread_restrictions.h"
#include "base/values.h" #include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_action_runner.h" #include "chrome/browser/extensions/extension_action_runner.h"
#include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service.h"
...@@ -481,9 +482,15 @@ class DeclarativeNetRequestBrowserTest ...@@ -481,9 +482,15 @@ class DeclarativeNetRequestBrowserTest
using DeclarativeNetRequestBrowserTest_Packed = using DeclarativeNetRequestBrowserTest_Packed =
DeclarativeNetRequestBrowserTest; DeclarativeNetRequestBrowserTest;
#if defined(OS_WIN) && !defined(NDEBUG)
// TODO: test times out on win7-debug. http://crbug.com/900447.
#define MAYBE_BlockRequests_UrlFilter DISABLED_BlockRequests_UrlFilter
#else
#define MAYBE_BlockRequests_UrlFilter BlockRequests_UrlFilter
#endif
// Tests the "urlFilter" property of a declarative rule condition. // Tests the "urlFilter" property of a declarative rule condition.
IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestBrowserTest, IN_PROC_BROWSER_TEST_P(DeclarativeNetRequestBrowserTest,
BlockRequests_UrlFilter) { MAYBE_BlockRequests_UrlFilter) {
struct { struct {
std::string url_filter; std::string url_filter;
int id; int id;
......
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