Convert most of the rest of instrumentation tests in content

base/test/android/javatests/src/org/chromium/base/test/util/CommandLineFlags.java

 // Copyright 2015 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.base.test.util;
 
 import android.content.Context;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.chromium.base.BaseChromiumApplication;
 import org.chromium.base.CommandLine;
 import org.chromium.base.test.BaseTestResult.PreTestHook;
 import org.chromium.base.test.util.parameter.BaseParameter;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ skipping 129 matching lines @@
     public static class Parameter extends BaseParameter {
         public static final String PARAMETER_TAG = "cmdlinearg-parameter";
         public static final String ADD_ARG = "add";
         public static final String REMOVE_ARG = "remove";
 
         public Parameter(org.chromium.base.test.util.parameter.Parameter.Reader parameterReader) {
             super(PARAMETER_TAG, parameterReader);
         }
     }
 }