Make rAc() disabled by default and require a flag to be turned on (again) for

all platforms. This CL is only for merging to M29 and will be reverted from 
trunk right after its merged. 

R=jam@chromium.org
TEST=no rAc() by default on M29 
BUG=254561

Review URL: https://codereview.chromium.org/18029016

git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@209199 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 9 deletions

diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index d242fa1..a5647d5 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -188,6 +188,10 @@ class AutofillDialogControllerTest : public InProcessBrowserTest {
   AutofillDialogControllerTest() {}
   virtual ~AutofillDialogControllerTest() {}
 
+  virtual void SetUpCommandLine(CommandLine* cl) OVERRIDE {
+    cl->AppendSwitch(autofill::switches::kEnableInteractiveAutocomplete);
+  }
+
   void InitializeControllerOfType(DialogType dialog_type) {
     FormData form;
     form.name = ASCIIToUTF16("TestForm");
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index 53fd038..242491f 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -261,16 +261,10 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver(
   }
 
 #if defined(ENABLE_AUTOFILL_DIALOG)
-#if defined(OS_MACOSX)
-  bool enableAutofill = command_line.HasSwitch(
-      autofill::switches::kEnableInteractiveAutocomplete);
-#else
-  bool enableAutofill = !command_line.HasSwitch(
-      autofill::switches::kDisableInteractiveAutocomplete);
-#endif
   WebRuntimeFeatures::enableRequestAutocomplete(
-      enableAutofill ||
-      command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures));
+      command_line.HasSwitch(switches::kEnableExperimentalWebKitFeatures) ||
+      command_line.HasSwitch(
+           autofill::switches::kEnableInteractiveAutocomplete));
 #endif
 
   RenderThread* thread = RenderThread::Get();