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

remove autofill impl from upstream

Autofill involves calls to native view, so the dependency is not correct.
If we want to upstream autofill_external_delegate_android, we have to introduce another delegate.
Remove the code from upstream for now.

BUG=
TEST=


Review URL: https://chromiumcodereview.appspot.com/10701058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146021 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/autofill/autofill_external_delegate_android.cc → 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);
 }

chrome/chrome_browser.gypi

@@ -169,7 +169,6 @@
         'browser/autofill/autofill_download.h',
         'browser/autofill/autofill_external_delegate.cc',
         'browser/autofill/autofill_external_delegate.h',
-        'browser/autofill/autofill_external_delegate_android.cc',
         'browser/autofill/autofill_external_delegate_gtk.cc',
         'browser/autofill/autofill_external_delegate_gtk.h',
         'browser/autofill/autofill_feedback_infobar_delegate.cc',

chrome/chrome_tests.gypi

@@ -85,6 +85,7 @@
         'browser/autofill/data_driven_test.h',
         'browser/autofill/test_autofill_external_delegate.cc',
         'browser/autofill/test_autofill_external_delegate.h',
+        'browser/autofill/test_autofill_external_delegate_android.cc',
         'browser/automation/mock_tab_event_observer.cc',
         'browser/automation/mock_tab_event_observer.h',
         'browser/chromeos/cros/mock_cert_library.cc',