ContentShell rendering support on Android.

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

Index: content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
index c4ca176fe85a413467072ea203936a6d6e370549..877f8303a42ed1a8f17c07b51ed9f1cfb904e16a 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java
@@ -36,10 +36,6 @@ public class ContentShellActivity extends Activity {
         // Initializing the command line must occur before loading the library.
         if (!CommandLine.isInitialized()) CommandLine.initFromFile(COMMAND_LINE_FILE);
         String startupUrl = getUrlFromIntent(getIntent());
-        if (!TextUtils.isEmpty(startupUrl)) {
-            CommandLine.getInstance().appendSwitchesAndArguments(
-                    new String[] {Shell.sanitizeUrl(startupUrl)});
-        }
         waitForDebuggerIfNeeded();
 
         LibraryLoader.loadAndInitSync();
@@ -47,6 +43,12 @@ public class ContentShellActivity extends Activity {
 
         setContentView(R.layout.content_shell_activity);
         mShellManager = (ShellManager) findViewById(R.id.shell_container);
+
+        if (!TextUtils.isEmpty(startupUrl)) {

[Ted C, 2012/07/31 20:58:05]

Move the declaration of startupUrl to right above this block as this isn't used
up there anymore.

[no sievers, 2012/07/31 21:17:17]

Done.

+            startupUrl = Shell.sanitizeUrl(startupUrl);

[Ted C, 2012/07/31 20:58:05]

no need to further modify startupUrl.

This can just be:
mShellManager.setStartupUrl(Shell.sanitizeUrl(startupUrl));

[no sievers, 2012/07/31 21:17:17]

Done.

+            mShellManager.setStartupUrl(startupUrl);
+        }
+
         if (!ContentView.enableMultiProcess(this, ContentView.MAX_RENDERERS_AUTOMATIC)) {
             String shellUrl = DEFAULT_SHELL_URL;
             if (savedInstanceState != null