Merging Managed and Important connection.

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

 // Copyright 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.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
@@ skipping 14 matching lines @@
 import org.chromium.android_webview.renderer_priority.RendererPriority;
 import org.chromium.android_webview.test.TestAwContentsClient.OnDownloadStartHelper;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.parameter.ParameterizedTest;
 import org.chromium.content.browser.BindingManager;
+import org.chromium.content.browser.ChildProcessConnection;
 import org.chromium.content.browser.ChildProcessLauncher;
-import org.chromium.content.browser.ManagedChildProcessConnection;
 import org.chromium.content_public.common.ContentUrlConstants;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ skipping 531 matching lines @@
                     }
                 }
                 assertTrue(mForegroundState.size() != 0);
                 assertEquals(inForeground, mForegroundState.get(0).booleanValue());
                 mForegroundState.remove(0);
                 return;
             }
         }
 
         @Override
-        public void addNewConnection(int pid, ManagedChildProcessConnection connection) {
+        public void addNewConnection(int pid, ChildProcessConnection connection) {
             mIsChildProcessCreated = true;
         }
 
         @Override
         public void setPriority(int pid, boolean foreground, boolean boostForPendingView) {
             synchronized (mForegroundStateLock) {
                 mForegroundState.add(foreground);
                 mForegroundStateLock.notifyAll();
             }
         }
@@ skipping 138 matching lines @@
     public void testPauseDestroyResume() throws Throwable {
         AwContents awContents;
         awContents = createAwTestContainerView(mContentsClient).getAwContents();
         awContents.pauseTimers();
         awContents.pauseTimers();
         awContents.destroy();
         awContents = createAwTestContainerView(mContentsClient).getAwContents();
         awContents.resumeTimers();
     }
 }