Mark flaky content tests with @RetryOnFailure

content/public/android/javatests/src/org/chromium/content/browser/InterfaceRegistryTest.java

 // 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.
 
 package org.chromium.content.browser;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
+import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.content.browser.InterfaceRegistry.ImplementationFactory;
 import org.chromium.content_shell.ShellMojoTestUtils;
 import org.chromium.content_shell_apk.ContentShellTestBase;
 import org.chromium.mojo.bindings.ConnectionErrorHandler;
 import org.chromium.mojo.bindings.InterfaceRequest;
 import org.chromium.mojo.bindings.test.mojom.math.Calculator;
 import org.chromium.mojo.system.MojoException;
 import org.chromium.mojo.system.Pair;
 import org.chromium.mojo.system.impl.CoreImpl;
 
@@ skipping 89 matching lines @@
         }
         ShellMojoTestUtils.tearDownTestEnvironment(mNativeTestEnvironment);
         mNativeTestEnvironment = 0;
         super.tearDown();
     }
 
     /**
      * Verifies that remote interface can be requested and works.
      */
     @SmallTest
+    @RetryOnFailure
     public void testGetInterface() {
         Pair<InterfaceRegistry, InterfaceProvider> registryAndProvider =
                 ShellMojoTestUtils.createInterfaceRegistryAndProvider(mNativeTestEnvironment);
         InterfaceRegistry registry = registryAndProvider.first;
         InterfaceProvider provider = registryAndProvider.second;
 
         // Add the Calculator interface.
         registry.addInterface(Calculator.MANAGER, new CalculatorFactory());
 
         Pair<Calculator.Proxy, InterfaceRequest<Calculator>> requestPair =
@@ skipping 65 matching lines @@
         calculator.getProxyHandler().setErrorHandler(errorHandler);
         mCloseablesToClose.add(calculator);
         provider.getInterface(Calculator.MANAGER, requestPair.second);
 
         // Spin the message loop and verify that an error occured.
         assertNull(errorHandler.mLastMojoException);
         ShellMojoTestUtils.runLoop(RUN_LOOP_TIMEOUT_MS);
         assertNotNull(errorHandler.mLastMojoException);
     }
 }