Refactor ContentShell to remove ContentViewClient dependency.

content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

 // Copyright (c) 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.content_shell;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ skipping 17 matching lines @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Initializing the command line must occur before loading the library.
         CommandLine.initFromFile(COMMAND_LINE_FILE);
         String startupUrl = getUrlFromIntent(getIntent());
         if (!TextUtils.isEmpty(startupUrl)) {
             CommandLine.getInstance().appendSwitchesAndArguments(
-                    new String[] {ShellView.sanitizeUrl(startupUrl)});
+                    new String[] {Shell.sanitizeUrl(startupUrl)});
         }
         waitForDebuggerIfNeeded();
 
         LibraryLoader.loadAndInitSync();
         initializeContentViewResources();
 
         setContentView(R.layout.content_shell_activity);
         mShellManager = (ShellManager) findViewById(R.id.shell_container);
         ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC);
     }
 
     private void waitForDebuggerIfNeeded() {
         if (CommandLine.getInstance().hasSwitch(CommandLine.WAIT_FOR_JAVA_DEBUGGER)) {
             Log.e(TAG, "Waiting for Java debugger to connect...");
             android.os.Debug.waitForDebugger();
             Log.e(TAG, "Java debugger connected. Resuming execution.");
         }
     }
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode != KeyEvent.KEYCODE_BACK) return super.onKeyUp(keyCode, event);
 
-        ShellView activeView = getActiveShellView();
+        Shell activeView = getActiveShell();
         if (activeView != null && activeView.getContentView().canGoBack()) {
             activeView.getContentView().goBack();
             return true;
         }
 
         return super.onKeyUp(keyCode, event);
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         String url = getUrlFromIntent(intent);
         if (!TextUtils.isEmpty(url)) {
-            ShellView activeView = getActiveShellView();
+            Shell activeView = getActiveShell();
             if (activeView != null) {
                 activeView.loadUrl(url);
             }
         }
     }
 
     private static String getUrlFromIntent(Intent intent) {
         return intent != null ? intent.getDataString() : null;
     }
 
     /**
      * @return The {@link ShellManager} configured for the activity or null if it has not been
      *         created yet.
      */
     public ShellManager getShellManager() {
         return mShellManager;
     }
 
     /**
-     * @return The currently visible {@link ShellView} or null if one is not showing.
+     * @return The currently visible {@link Shell} or null if one is not showing.
      */
-    public ShellView getActiveShellView() {
-        return mShellManager != null ? mShellManager.getActiveShellView() : null;
+    public Shell getActiveShell() {
+        return mShellManager != null ? mShellManager.getActiveShell() : null;
     }
 
     private void initializeContentViewResources() {
         AppResource.DIMENSION_LINK_PREVIEW_OVERLAY_RADIUS = R.dimen.link_preview_overlay_radius;
         AppResource.DRAWABLE_LINK_PREVIEW_POPUP_OVERLAY = R.drawable.popup_zoomer_overlay;
     }
 }