Disable FrameNavigationEntry_NewSubframe on Android due to flakes.

content/browser/frame_host/navigation_controller_impl_browsertest.cc

 // Copyright 2014 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 "content/browser/frame_host/navigation_controller_impl.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
@@ skipping 2220 matching lines @@
         "   +--Site B ------- proxies for A\n"
         "        +--Site A -- proxies for B\n"
         "Where A = http://127.0.0.1/\n"
         "      B = http://foo.com/",
         visualizer.DepictFrameTree(root));
   }
 }
 
 // Verify the tree of FrameNavigationEntries after NAVIGATION_TYPE_NEW_SUBFRAME
 // commits.
-// Disabled due to flakes on Linux Tests; see https://crbug.com/646836.
-#if defined(OS_LINUX)
+// Disabled due to flakes; see https://crbug.com/646836.
+#if defined(OS_ANDROID) || defined(OS_LINUX)
 #define MAYBE_FrameNavigationEntry_NewSubframe \
     DISABLED_FrameNavigationEntry_NewSubframe
 #else
 #define MAYBE_FrameNavigationEntry_NewSubframe FrameNavigationEntry_NewSubframe
 #endif
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        MAYBE_FrameNavigationEntry_NewSubframe) {
   GURL main_url(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
@@ skipping 4621 matching lines @@
   // Verify that the extra header was NOT present for the subresource.
   const net::test_server::HttpRequest* image_request =
       FindAccumulatedRequest(image_url);
   ASSERT_TRUE(image_request);
   EXPECT_THAT(image_request->headers,
               testing::Not(testing::Contains(
                   testing::Key("X-ExtraHeadersVsSubresources"))));
 }
 
 }  // namespace content