Mark part of BrannColorTest as flaky

chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
index 8c313f21a9f11be94ab6b79f30ec88b88437c999..de7612da169b9e11d058da7dd3350a2cb99bd22f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/toolbar/BrandColorTest.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.toolbar;
 
 import android.graphics.Color;
+import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
 
@@ -87,8 +88,10 @@ public class BrandColorTest extends DocumentActivityTestBase {
     /**
      * Test for having default primary color working correctly.
      */
-    @SmallTest
-    @Feature({"Omnibox"})
+//    @SmallTest
+//    @Feature({"Omnibox"})
+//    crbug.com/515948
+    @FlakyTest
     public void testNoBrandColor() throws InterruptedException {
         startMainActivityWithURL(getUrlWithBrandColor(""));
         checkForBrandColor(mDefaultColor);
@@ -137,8 +140,10 @@ public class BrandColorTest extends DocumentActivityTestBase {
      * Test for checking navigating to a brand color site from a site with no brand color and then
      * back again.
      */
-    @SmallTest
-    @Feature({"Omnibox"})
+//    @SmallTest
+//    @Feature({"Omnibox"})
+//    crbug.com/515948
+    @FlakyTest
     public void testNavigatingToBrandColorAndBack() throws InterruptedException {
         startMainActivityWithURL("about:blank");
         checkForBrandColor(mDefaultColor);
@@ -165,8 +170,10 @@ public class BrandColorTest extends DocumentActivityTestBase {
     /**
      * Test for interstitial page loads resetting brand color.
      */
-    @SmallTest
-    @Feature({"Omnibox"})
+//    @SmallTest
+//    @Feature({"Omnibox"})
+//    crbug.com/515948
+    @FlakyTest
     public void testBrandColorInterstitial() throws InterruptedException {
         final String brandColorUrl = getUrlWithBrandColor(BRAND_COLOR_1);
         startMainActivityWithURL(brandColorUrl);