Merge 201209 "Disable intreactive autocomplete and remove comman..."

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 1249 matching lines @@
     "wallet-service-use-prod",
     IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_NAME,
     IDS_FLAGS_ENABLE_WALLET_PRODUCTION_SERVICE_DESCRIPTION,
     kOsCrOS | kOsWin,
     SINGLE_VALUE_TYPE(autofill::switches::kWalletServiceUseProd)
   },
   {
     "enable-interactive-autocomplete",
     IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_NAME,
     IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_DESCRIPTION,
-    kOsWin | kOsCrOS | kOsAndroid,
+    kOsWin | kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kEnableInteractiveAutocomplete)
   },
 #if defined(USE_AURA)
   {
     "overscroll-history-navigation",
     IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_NAME,
     IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION,
     kOsAll,
     ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
         switches::kOverscrollHistoryNavigation, "1",
@@ skipping 665 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags