Reintegrate 552 r66225-r66645....

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 145 matching lines @@
   //   IDS_FLAGS_WEBGL_DESCRIPTION,
   //   kOsAll,
   //   switches::kDisableExperimentalWebGL
   // }
   //{
   //  "print-preview",  // Do not change; see above
   //  IDS_FLAGS_PRINT_PREVIEW_NAME,
   //  IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
   //  kOsAll,
   //  switches::kEnablePrintPreview
-  //}
+  //},
+  {
+    "click-to-play",   // Do not change; see above.
+    IDS_FLAGS_CLICK_TO_PLAY_NAME,
+    IDS_FLAGS_CLICK_TO_PLAY_DESCRIPTION,
+    kOsAll,
+    switches::kEnableClickToPlay
+  },
 };
 
 const Experiment* experiments = kExperiments;
 size_t num_experiments = arraysize(kExperiments);
 
 // Stores and encapsulates the little state that about:flags has.
 class FlagsState {
  public:
   FlagsState() : needs_restart_(false) {}
   void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
@@ skipping 272 matching lines @@
     num_experiments = arraysize(kExperiments);
   } else {
     experiments = e;
     num_experiments = count;
   }
 }
 
 }  // namespace testing
 
 }  // namespace about_flags