Allow BrowserTestBase to do wait.

content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java

Index: content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
index 3d07e84aa429dd4e198b4ede068e7d9ca1954fc2..86992a57f303756c09dd7668b0dcacc96c5756fc 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
@@ -7,6 +7,8 @@ package org.chromium.content_browsertests_apk;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
 import android.util.Log;
 
 import org.chromium.content.app.LibraryLoader;
@@ -32,8 +34,10 @@ public class ContentBrowserTestsActivity extends Activity {
         }
         AndroidBrowserProcess.initChromiumBrowserProcessForTests();
 
-        setContentView(R.layout.test_activity);
-        mShellManager = (ShellManager) findViewById(R.id.shell_container);
+        LayoutInflater inflater =
+                (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View view = inflater.inflate(R.layout.test_activity, null);
+        mShellManager = (ShellManager) view.findViewById(R.id.shell_container);
         mActivityNativeWindow = new ActivityNativeWindow(this);
         mShellManager.setWindow(mActivityNativeWindow);