Refactor ContentShell to remove ContentViewClient dependency.

content/shell/android/shell_manager.h

Index: content/shell/android/shell_manager.h
diff --git a/content/shell/android/shell_manager.h b/content/shell/android/shell_manager.h
index 4fa0f331248849a7ae7c29150f87c56ac80b09b9..640d98e1a4411589146f332849dcf36b111334f5 100644
--- a/content/shell/android/shell_manager.h
+++ b/content/shell/android/shell_manager.h
@@ -5,17 +5,18 @@
 #ifndef CONTENT_SHELL_ANDROID_SHELL_MANAGER_H_
 #define CONTENT_SHELL_ANDROID_SHELL_MANAGER_H_
 
+#include <jni.h>
+
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 
 namespace content {
-class ShellView;
 
 // Creates an Android specific shell view, which is our version of a shell
 // window.  This view holds the controls and content views necessary to
-// render a shell window.  Returns a ShellView ptr bound to an initialized java
+// render a shell window.  Returns the java object representing the shell view.
 // object.
-content::ShellView* CreateShellView();
+jobject CreateShellView();
 
 // Registers the ShellManager native methods.
 bool RegisterShellManager(JNIEnv* env);