Add flags for new Autofill work.

chrome/browser/ui/tab_contents/tab_contents.cc

Index: chrome/browser/ui/tab_contents/tab_contents.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index 4b683349122d2251df0ad102f098d406e43f692b..367dbba0894b022ef87989c6bde5a47dd2f6855c 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -117,8 +117,13 @@ TabContents::TabContents(WebContents* contents)
   TabAutofillManagerDelegate::CreateForWebContents(contents);
   AutofillManager::CreateForWebContentsAndDelegate(
       contents, TabAutofillManagerDelegate::FromWebContents(contents));
+#if !defined(OS_ANDROID)

[Albert Bodenhamer, 2012/10/19 16:46:52]

Wrapping an if() in a conditional compile like this is a bit hard to read. 
Consider:
#if defined(OS_ANDROID)
  bool enable_new_autofill_ui = true;
#else
  bool enable_new_autofill_ui = CommandLine::ForCurrentProcess()->HasSwitch(   
switches::kEnableNewAutofillUi))
#endif

if(enable_new_autofill_ui) {

[joth, 2012/10/19 22:04:06]

Android is just about to stop using tab_contents.cc altogether, so you could
TODO(nileshagrawal) to remove this ifdef  real soon now.

[Ilya Sherman, 2012/10/19 22:16:26]

Given joth's comment, I've left the code in android/chrome_startup_flags.cc and
added a TODO for Nilesh to remove the code once the dependency on
tab_contents.cc is gone.

   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kExternalAutofillPopup)) {
+          switches::kEnableNewAutofillUi)) {
+#else
+  // Always enable the external popup on Android.
+  if (true) {
+#endif
     AutofillExternalDelegate::CreateForWebContentsAndManager(
         contents, AutofillManager::FromWebContents(contents));
     AutofillManager::FromWebContents(contents)->SetExternalDelegate(