[Print Preview] Re-add flags for register promos

[Print Preview] Re-add flags for register promos

Register promos are not cleared for M34. Re-add the flags for the register
promo.

BUG=350488
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256014

[Vitaly Buka (NO REVIEWS), 2014-03-07 23:08:56]

lgtm

[commit-bot: I haz the power, 2014-03-07 23:10:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/189483006/20001

[commit-bot: I haz the power, 2014-03-07 23:10:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-07 23:10:12]

Failed to apply patch for chrome/browser/about_flags.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/about_flags.cc
  Hunk #1 FAILED at 407.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/about_flags.cc.rej

Patch:       chrome/browser/about_flags.cc
Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index
6480546f17716d69a105b474509a234c5f6784d8..454bc2784e16de6334c1fdf958d309b1bc80a7f7
100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -407,1527 +407,841 @@ const Experiment::Choice
kNotificationCenterTrayBehaviorChoices[] = {
 //
 // When adding a new choice, add it to the end of the list.
 const Experiment kExperiments[] = {
-  {
-    "conflicting-modules-check",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_CONFLICTS_CHECK_NAME,
-    IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION,
-    kOsWin,
-    SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck)
-  },
-  {
-    "ignore-gpu-blacklist",
-    IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME,
-    IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)
-  },
-  {
-    "force-compositing-mode-2",
-    IDS_FLAGS_FORCE_COMPOSITING_MODE_NAME,
-    IDS_FLAGS_FORCE_COMPOSITING_MODE_DESCRIPTION,
-    kOsLinux,
-    ENABLE_DISABLE_VALUE_TYPE(switches::kForceCompositingMode,
-                              switches::kDisableForceCompositingMode)
-  },
-  {
-    "threaded-compositing-mode",
-    IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME,
-    IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION,
-    kOsLinux,
-    ENABLE_DISABLE_VALUE_TYPE(switches::kEnableThreadedCompositing,
-                              switches::kDisableThreadedCompositing)
-  },
-  {
-    "force-accelerated-composited-scrolling",
+    {"conflicting-modules-check",  // FLAGS:RECORD_UMA
+     IDS_FLAGS_CONFLICTS_CHECK_NAME, IDS_FLAGS_CONFLICTS_CHECK_DESCRIPTION,
+     kOsWin, SINGLE_VALUE_TYPE(switches::kConflictingModulesCheck)},
+    {"ignore-gpu-blacklist", IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME,
+     IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
+    {"force-compositing-mode-2", IDS_FLAGS_FORCE_COMPOSITING_MODE_NAME,
+     IDS_FLAGS_FORCE_COMPOSITING_MODE_DESCRIPTION, kOsLinux,
+     ENABLE_DISABLE_VALUE_TYPE(switches::kForceCompositingMode,
+                               switches::kDisableForceCompositingMode)},
+    {"threaded-compositing-mode", IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME,
+     IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION, kOsLinux,
+     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableThreadedCompositing,
+                               switches::kDisableThreadedCompositing)},
+    {"force-accelerated-composited-scrolling",
      IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME,
-     IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION,
-     kOsAll,
+     IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION, kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAcceleratedOverflowScroll,
-                               switches::kDisableAcceleratedOverflowScroll)
-  },
-  {
-    "force-universal-accelerated-composited-scrolling",
+                               switches::kDisableAcceleratedOverflowScroll)},
+    {"force-universal-accelerated-composited-scrolling",
      IDS_FLAGS_FORCE_UNIVERSAL_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME,
      IDS_FLAGS_FORCE_UNIVERSAL_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION,
-     kOsAll,
-     ENABLE_DISABLE_VALUE_TYPE(
-         switches::kEnableUniversalAcceleratedOverflowScroll,
-         switches::kDisableUniversalAcceleratedOverflowScroll)
-  },
+     kOsAll, ENABLE_DISABLE_VALUE_TYPE(
+                 switches::kEnableUniversalAcceleratedOverflowScroll,
+                 switches::kDisableUniversalAcceleratedOverflowScroll)},
 #if defined(OS_WIN)
-  {
-    "enable-direct-write",
-    IDS_FLAGS_ENABLE_DIRECT_WRITE_NAME,
-    IDS_FLAGS_ENABLE_DIRECT_WRITE_DESCRIPTION,
-    kOsWin,
-    SINGLE_VALUE_TYPE(switches::kEnableDirectWrite)
-  },
+    {"enable-direct-write", IDS_FLAGS_ENABLE_DIRECT_WRITE_NAME,
+     IDS_FLAGS_ENABLE_DIRECT_WRITE_DESCRIPTION, kOsWin,
+     SINGLE_VALUE_TYPE(switches::kEnableDirectWrite)},
 #endif
-  {
-    "enable-experimental-canvas-features",
-    IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME,
-    IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)
-  },
-  {
-    "disable-accelerated-2d-canvas",
-    IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME,
-    IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)
-  },
-  {
-    "composited-layer-borders",
-    IDS_FLAGS_COMPOSITED_LAYER_BORDERS,
-    IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)
-  },
-  {
-    "show-fps-counter",
-    IDS_FLAGS_SHOW_FPS_COUNTER,
-    IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)
-  },
-  {
-    "accelerated-filters",
-    IDS_FLAGS_ACCELERATED_FILTERS,
-    IDS_FLAGS_ACCELERATED_FILTERS_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableAcceleratedFilters)
-  },
-  {
-    "disable-webgl",
-    IDS_FLAGS_DISABLE_WEBGL_NAME,
-    IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)
-  },
-  {
-    "enable-d3d11",
-    IDS_FLAGS_ENABLE_D3D11_NAME,
-    IDS_FLAGS_ENABLE_D3D11_DESCRIPTION,
-    kOsWin,
-    SINGLE_VALUE_TYPE(switches::kEnableD3D11)
-  },
-  {
-    "disable-webrtc",
-    IDS_FLAGS_DISABLE_WEBRTC_NAME,
-    IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION,
-    kOsAndroid,
+    {"enable-experimental-canvas-features",
+     IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME,
+     IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)},
+    {"disable-accelerated-2d-canvas",
+     IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME,
+     IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
+    {"composited-layer-borders", IDS_FLAGS_COMPOSITED_LAYER_BORDERS,
+     IDS_FLAGS_COMPOSITED_LAYER_BORDERS_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(cc::switches::kShowCompositedLayerBorders)},
+    {"show-fps-counter", IDS_FLAGS_SHOW_FPS_COUNTER,
+     IDS_FLAGS_SHOW_FPS_COUNTER_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)},
+    {"accelerated-filters", IDS_FLAGS_ACCELERATED_FILTERS,
+     IDS_FLAGS_ACCELERATED_FILTERS_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kEnableAcceleratedFilters)},
+    {"disable-webgl", IDS_FLAGS_DISABLE_WEBGL_NAME,
+     IDS_FLAGS_DISABLE_WEBGL_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kDisableExperimentalWebGL)},
+    {"enable-d3d11", IDS_FLAGS_ENABLE_D3D11_NAME,
+     IDS_FLAGS_ENABLE_D3D11_DESCRIPTION, kOsWin,
+     SINGLE_VALUE_TYPE(switches::kEnableD3D11)},
+    {"disable-webrtc", IDS_FLAGS_DISABLE_WEBRTC_NAME,
+     IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION, kOsAndroid,
 #if defined(OS_ANDROID)
-    SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
+     SINGLE_VALUE_TYPE(switches::kDisableWebRTC)
 #else
-    SINGLE_VALUE_TYPE("")
+     SINGLE_VALUE_TYPE("")
 #endif
-  },
+    },
 #if defined(ENABLE_WEBRTC)
-  {
-    "disable-device-enumeration",
-    IDS_FLAGS_DISABLE_DEVICE_ENUMERATION_NAME,
-    IDS_FLAGS_DISABLE_DEVICE_ENUMERATION_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kDisableDeviceEnumeration)
-  },
-  {
-    "disable-sctp-data-channels",
-    IDS_FLAGS_DISABLE_SCTP_DATA_CHANNELS_NAME,
-    IDS_FLAGS_DISABLE_SCTP_DATA_CHANNELS_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kDisableSCTPDataChannels)
-  },
-  {
-    "disable-webrtc-hw-decoding",
-    IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME,
-    IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION,
-    kOsAndroid | kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)
-  },
-  {
-    "disable-webrtc-hw-encoding",
-    IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME,
-    IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION,
-    kOsAndroid | kOsCrOS,
-    SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)
-  },
+    {"disable-device-enumeration", IDS_FLAGS_DISABLE_DEVICE_ENUMERATION_NAME,
+     IDS_FLAGS_DISABLE_DEVICE_ENUMERATION_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kDisableDeviceEnumeration)},
+    {"disable-sctp-data-channels", IDS_FLAGS_DISABLE_SCTP_DATA_CHANNELS_NAME,
+     IDS_FLAGS_DISABLE_SCTP_DATA_CHANNELS_DESCRIPTION, kOsAll,
+     SINGLE_VALUE_TYPE(switches::kDisableSCTPDataChannels)},
+    {"disable-webrtc-hw-decoding", IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME,
+     IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION, kOsAndroid | kOsCrOS,
+     SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
+    {"disable-webrtc-hw-encoding", IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME,
+     IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION, kOsAndroid | kOsCrOS,
+     SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
 #endif
 #if defined(OS_ANDROID)
 #if defined(ARCH_CPU_X86)
-  {
-      "enable-webaudio",
-      IDS_FLAGS_ENABLE_WEBAUDIO_NAME,
-      IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION,
-      kOsAndroid,
-      SINGLE_VALUE_TYPE(switches::kEnableWebAudio)
-  },
+    {"enable-webaudio", IDS_FLAGS_ENABLE_WEBAUDIO_NAME,
+     IDS_FLAGS_ENABLE_WEBAUDIO_DESCRIPTION, kOsAndroid,
+     SINGLE_VALUE_TYPE(switches::kEnableWebAudio)},
 #else
-  {
-    "disable-webaudio",
-    IDS_FLAGS_DISABLE_WEBAUDIO_NAME,
-    IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION,
-    kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kDisableWebAudio)
-  },
+    {"disable-web…
(message too large)

[Noam Samuel, 2014-03-07 23:15:25]

Oh whoops. My auto-formatter auto-formatted the about:flags section. I can
revert this.

[Noam Samuel, 2014-03-07 23:21:02]

The CQ bit was checked by noamsml@chromium.org

[Noam Samuel, 2014-03-07 23:21:29]

On 2014/03/07 23:15:25, Noam Samuel wrote:
> Oh whoops. My auto-formatter auto-formatted the about:flags section. I can
> revert this.

Re-uploaded the CL sans autoformat. Shouldn't have the same trouble as before.

[commit-bot: I haz the power, 2014-03-07 23:22:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/189483006/40001

[commit-bot: I haz the power, 2014-03-08 11:09:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/189483006/40001

[commit-bot: I haz the power, 2014-03-08 14:36:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-08 14:36:16]

Retried try job too often on mac_rel for step(s) telemetry_perf_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[Noam Samuel, 2014-03-10 17:45:35]

The CQ bit was checked by noamsml@chromium.org

[commit-bot: I haz the power, 2014-03-10 18:01:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/noamsml@chromium.org/189483006/40001

[commit-bot: I haz the power, 2014-03-10 20:08:05]

Change committed as 256014