[Android] Fix unknown handling in gtest_test_instance.

content/browser/download/mhtml_generation_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 347 matching lines @@
   std::string mhtml;
   ASSERT_TRUE(base::ReadFileToString(path, &mhtml));
 
   EXPECT_THAT(mhtml, HasSubstr("Main Frame"));
   // Make sure the contents are missing.
   EXPECT_THAT(mhtml, Not(HasSubstr("no-store test body")));
   // This image comes from a resource marked no-store.
   EXPECT_THAT(mhtml, Not(ContainsRegex("Content-Location:.*nostore.jpg")));
 }
 
+// TODO(crbug.com/615291): These fail on Android under some circumstances.
+#if defined(OS_ANDROID)
+#define MAYBE_ViewedMHTMLContainsNoStoreContentIfNoCacheControlPolicy \
+    DISABLED_ViewedMHTMLContainsNoStoreContentIfNoCacheControlPolicy
+#define MAYBE_ViewedMHTMLDoesNotContainNoStoreContent \
+    DISABLED_ViewedMHTMLDoesNotContainNoStoreContent
+#else
+#define MAYBE_ViewedMHTMLContainsNoStoreContentIfNoCacheControlPolicy \
+    ViewedMHTMLContainsNoStoreContentIfNoCacheControlPolicy
+#define MAYBE_ViewedMHTMLDoesNotContainNoStoreContent \
+    ViewedMHTMLDoesNotContainNoStoreContent
+#endif
+
 IN_PROC_BROWSER_TEST_F(
     MHTMLGenerationTest,
-    ViewedMHTMLContainsNoStoreContentIfNoCacheControlPolicy) {
+    MAYBE_ViewedMHTMLContainsNoStoreContentIfNoCacheControlPolicy) {
   // Generate MHTML, specifying the FailForNoStoreMainFrame policy.
   base::FilePath path(temp_dir_.path());
   path = path.Append(FILE_PATH_LITERAL("test.mht"));
   MHTMLGenerationParams params(path);
 
   // No special cache control options so we should see both frames.
   std::vector<std::string> expectations = {
       "Main Frame, normal headers.", "Cache-Control: no-store test body",
   };
   std::vector<std::string> forbidden;
   TestOriginalVsSavedPage(
       embedded_test_server()->GetURL("/page_with_nostore_iframe.html"), params,
       2 /* expected number of frames */, expectations, forbidden);
 
   std::string mhtml;
   ASSERT_TRUE(base::ReadFileToString(params.file_path, &mhtml));
 }
 
 IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest,
-                       ViewedMHTMLDoesNotContainNoStoreContent) {
+                       MAYBE_ViewedMHTMLDoesNotContainNoStoreContent) {
   // Generate MHTML, specifying the FailForNoStoreMainFrame policy.
   base::FilePath path(temp_dir_.path());
   path = path.Append(FILE_PATH_LITERAL("test.mht"));
   MHTMLGenerationParams params(path);
   params.cache_control_policy = blink::WebFrameSerializerCacheControlPolicy::
       SkipAnyFrameOrResourceMarkedNoStore;
 
   // No special cache control options so we should see both frames.
   std::vector<std::string> expectations = {
       "Main Frame, normal headers.",
@@ skipping 54 matching lines @@
 
   // Make sure that URLs of both frames are present
   // (note that these are single-line regexes).
   EXPECT_THAT(
       mhtml,
       ContainsRegex("Content-Location:.*/frame_tree/page_with_one_frame.html"));
   EXPECT_THAT(mhtml, ContainsRegex("Content-Location:.*/title1.html"));
 }
 
 }  // namespace content