Merge 62881 - Moves instant back into flags....

chrome/browser/about_flags.cc

 // Copyright (c) 2010 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 58 matching lines @@
     switches::kEnableVerticalTabs
   },
   {
     "tabbed-options",  // Do not change; see above.
     IDS_FLAGS_TABBED_OPTIONS_NAME,
     IDS_FLAGS_TABBED_OPTIONS_DESCRIPTION,
     kOsAll,
     switches::kEnableTabbedOptions
   },
   {
+    "match-preview",  // Do not change; see above.
+    IDS_FLAGS_INSTANT_NAME,
+    IDS_FLAGS_INSTANT_DESCRIPTION,
+    kOsWin,
+    switches::kEnableMatchPreview
+  },
+  {
     "remoting",  // Do not change; see above.
     IDS_FLAGS_REMOTING_NAME,
 #if defined(OS_WIN)
     // Windows only supports host functionality at the moment.
     IDS_FLAGS_REMOTING_HOST_DESCRIPTION,
 #elif defined(OS_LINUX)
     // Linux only supports client functionality at the moment.
     IDS_FLAGS_REMOTING_CLIENT_DESCRIPTION,
 #else
     // On other platforms, this lab isn't available at all.
@@ skipping 299 matching lines @@
 
 } // namespace
 
 namespace testing {
 void ClearState() {
   FlagsState::instance()->reset();
 }
 }  // namespace testing
 
 }  // namespace about_flags