Merge branch 'trunk' of http://git.chromium.org/git/chromium into autofill

chrome/browser/autofill/test_autofill_external_delegate_android.cc

Index: chrome/browser/autofill/test_autofill_external_delegate_android.cc
diff --git a/chrome/browser/autofill/autofill_external_delegate_android.cc b/chrome/browser/autofill/test_autofill_external_delegate_android.cc
similarity index 52%
rename from chrome/browser/autofill/autofill_external_delegate_android.cc
rename to chrome/browser/autofill/test_autofill_external_delegate_android.cc
index 5e583afaab60a9c7f89f10e0dd2a67969c943dbb..d50b1f1a23e88994728a9d6423195b89df279f68 100644
--- a/chrome/browser/autofill/autofill_external_delegate_android.cc
+++ b/chrome/browser/autofill/test_autofill_external_delegate_android.cc
@@ -2,14 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/autofill/autofill_external_delegate.h"
-
-#include "chrome/browser/autofill/autofill_manager.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/autofill/test_autofill_external_delegate.h"
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContents* tab_contents,
     AutofillManager* manager) {
-  NOTIMPLEMENTED() << "TODO(jrg): Upstream AutofillExternalDelegateAndroid";
-  return NULL;
+  return new TestAutofillExternalDelegate(tab_contents, manager);
 }