Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
index eff84c624af49406eda58790799c8f2793e7b5db..4342f14ddbc03be9e769928ed1ce41d2aeac12b0 100644 |
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc |
@@ -410,7 +410,12 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) { |
} |
} |
-TEST_F(DataReductionProxyNetworkDelegateTest, NetHistograms) { |
+#if defined(OS_ANDROID) |
+#define MAYBE_NetHistograms DISABLED_NetHistograms |
+#else |
+#define MAYBE_NetHistograms NetHistograms |
+#endif |
+TEST_F(DataReductionProxyNetworkDelegateTest, MAYBE_NetHistograms) { |
const std::string kReceivedValidOCLHistogramName = |
"Net.HttpContentLengthWithValidOCL"; |
const std::string kOriginalValidOCLHistogramName = |
@@ -670,7 +675,12 @@ TEST_F(DataReductionProxyNetworkDelegateTest, NullRequest) { |
EXPECT_TRUE(headers.HasHeader(kChromeProxyHeader)); |
} |
-TEST_F(DataReductionProxyNetworkDelegateTest, OnCompletedInternalLoFi) { |
+#if defined(OS_ANDROID) |
+#define MAYBE_OnCompletedInternalLoFi DISABLED_OnCompletedInternalLoFi |
+#else |
+#define MAYBE_OnCompletedInternalLoFi OnCompletedInternalLoFi |
+#endif |
+TEST_F(DataReductionProxyNetworkDelegateTest, MAYBE_OnCompletedInternalLoFi) { |
// Enable Lo-Fi. |
const struct { |
bool lofi_response; |
@@ -697,7 +707,14 @@ TEST_F(DataReductionProxyNetworkDelegateTest, OnCompletedInternalLoFi) { |
} |
} |
-TEST_F(DataReductionProxyNetworkDelegateTest, OnCompletedInternalLoFiPreview) { |
+#if defined(OS_ANDROID) |
+#define MAYBE_OnCompletedInternalLoFiPreview \ |
+ DISABLED_OnCompletedInternalLoFiPreview |
+#else |
+#define MAYBE_OnCompletedInternalLoFiPreview OnCompletedInternalLoFiPreview |
+#endif |
+TEST_F(DataReductionProxyNetworkDelegateTest, |
+ MAYBE_OnCompletedInternalLoFiPreview) { |
// Enable Lo-Fi. |
const struct { |
bool is_preview; |