Revert "Revert 155950 - Add initial Chromium TestShell support for Android"

chrome/android/testshell/testshell_stubs.cc

Index: chrome/android/testshell/testshell_stubs.cc
diff --git a/android_webview/lib/main/webview_stubs.cc b/chrome/android/testshell/testshell_stubs.cc
similarity index 51%
copy from android_webview/lib/main/webview_stubs.cc
copy to chrome/android/testshell/testshell_stubs.cc
index abdd15613df7e9f27ac0981ca35479024d7e4aed..717df43f7740f033ca618f060cf934eec9b50c48 100644
--- a/android_webview/lib/main/webview_stubs.cc
+++ b/chrome/android/testshell/testshell_stubs.cc
@@ -5,14 +5,13 @@
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 
-// This file contains temporary stubs to allow the libwebview target to compile.
-// They will be removed once real implementations are written/upstreamed, or
-// once other code is refactored to eliminate the need for them.
+// This file contains temporary stubs to allow the libtestshell target to
+// compile. They will be removed once real implementations are
+// written/upstreamed, or once other code is refactored to eliminate the
+// need for them.
 
 // static
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
-  // We don't need to return a real TabAndroid object yet.
-  // Eventually, WebView will need its own TabAndroid implementation.
   return NULL;
 }
 
@@ -20,8 +19,5 @@ TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContents* tab_contents,
     AutofillManager* manager) {
-  // We don't need to return a real AutofillExternalDelegate yet.
-  // Eventually, WebView will need an implementation (probably shared with
-  // Chrome).
   return NULL;
 }