Remove chrome://welcome page.

chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java

Index: chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
diff --git a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
index 76a5143918129ce61edb9de2fdd29d92634e3d8a..0d6e332666f62bd3fa6c8a6a69ce7d7c03a5170c 100644
--- a/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
+++ b/chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.java
@@ -6,16 +6,10 @@ package org.chromium.chrome.shell;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
-import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
-import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.ui.base.WindowAndroid;
 
-import java.util.Locale;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
 /**
  * Basic sanity test for loading urls in ChromeShell.
  */
@@ -33,53 +27,6 @@ public class ChromeShellUrlTest extends ChromeShellTestBase {
         assertNotNull(activity);
     }
 
-    @SmallTest
-    @Feature({"Main"})

[Ted C, 2014/10/02 17:29:32]

I think we want to keep some sort of test like this.  It was added in:
https://chromiumcodereview.appspot.com/11823063
and it was meant to check chrome:// page loading.

I think we should rename this to testChromePageLoads and update the url to
something like chrome://flags.  We should then add a comment that the page is
just any supported chrome page and should be updated if this is no longer valid.

-    public void testChromeWelcomePageLoads() throws InterruptedException {
-        String welcomeUrl = "chrome://welcome/";
-        final ChromeShellActivity activity = launchChromeShellWithUrl(welcomeUrl);
-        waitForActiveShellToBeDoneLoading();
-
-        // Make sure the activity was created as expected.
-        assertNotNull(activity);
-
-        // Ensure we have a valid ContentViewCore.
-        final AtomicReference<ContentViewCore> contentViewCore =
-                new AtomicReference<ContentViewCore>();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                contentViewCore.set(activity.getActiveContentViewCore());
-            }
-        });
-        assertNotNull(contentViewCore.get());
-        assertNotNull(contentViewCore.get().getContainerView());
-
-        // Ensure the correct page has been loaded, ie. not interstitial, and title/url should
-        // be sane. Note, a typical correct title is: "Welcome to Chromium", whereas a wrong one
-        // would be on the form "chrome://welcome/ is not available".
-        final AtomicBoolean isShowingInterstitialPage = new AtomicBoolean();
-        final AtomicReference<String> url = new AtomicReference<String>();
-        final AtomicReference<String> title = new AtomicReference<String>();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                isShowingInterstitialPage.set(contentViewCore.get().getWebContents()
-                        .isShowingInterstitialPage());
-                url.set(contentViewCore.get().getWebContents().getUrl());
-                title.set(contentViewCore.get().getWebContents().getTitle());
-            }
-        });
-        assertFalse("Showed interstitial page instead of welcome page",
-                isShowingInterstitialPage.get());
-        assertNotNull("URL was null", url.get());
-        assertTrue("URL did not contain: " + welcomeUrl + ". Was: " + url.get(),
-                url.get().contains(welcomeUrl));
-        assertNotNull("Title was null", title.get());
-        assertFalse("Title should not contain: " + welcomeUrl + ". Was: " + title.get(),
-                title.get().toLowerCase(Locale.US).contains(welcomeUrl));
-    }
-
     /**
      * Tests that creating an extra ContentViewRenderView does not cause an assert because we would
      * initialize the compositor twice http://crbug.com/162312