Enable ShortcutsProvider for omnibox on the trunk by default

chrome/browser/about_flags.cc

 // Copyright (c) 2011 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 313 matching lines @@
     MULTI_VALUE_TYPE(kPrerenderFromOmniboxChoices)
   },
   {
     "disable-panels",
     IDS_FLAGS_DISABLE_PANELS_NAME,
     IDS_FLAGS_DISABLE_PANELS_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisablePanels)
   },
   {
-    "enable-shortcuts-provider",
-    IDS_FLAGS_ENABLE_SHORTCUTS_PROVIDER,
-    IDS_FLAGS_ENABLE_SHORTCUTS_PROVIDER_DESCRIPTION,
+    "disable-shortcuts-provider",
+    IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER,
+    IDS_FLAGS_DISABLE_SHORTCUTS_PROVIDER_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableShortcutsProvider)
+    SINGLE_VALUE_TYPE(switches::kDisableShortcutsProvider)
   },
 #if defined(OS_CHROMEOS)
   {
     "enable-bluetooth",
     IDS_FLAGS_ENABLE_BLUETOOTH_NAME,
     IDS_FLAGS_ENABLE_BLUETOOTH_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kEnableBluetooth)
   },
 #endif
@@ skipping 516 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags