Rename about:labs to about:flags, step 1/3

This changes the url and the text on about:flags to a bit more scary.

The text is taken from https://docs.google.com/a/google.com/document/d/1VRZjR3GGX2FJFsAe8AKMAYRNPMp-sH2cefU0KvaQo0M/edit?hl=en#

BUG=59139,53399
TEST=about:labs doesn't do anything any more. about:flags does.

Review URL: http://codereview.chromium.org/3817004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62624 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 106 insertions, 98 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f3b6166..9184e60 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3988,113 +3988,113 @@ Keep your key file in a safe place. You will need it to create new versions of y
         Priority:
       </message>
 
-      <!-- Labs -->
-      <message name="IDS_LABS_TITLE" desc="Title for the chrome://labs page. Should be translated like 'Labs' is at googlelabs.com.">
-        Labs
+      <!-- about:flags -->
+      <message name="IDS_FLAGS_LONG_TITLE" desc="Long version of the title for the about:flags page.">
+        Careful, these experiments may bite
       </message>
-      <message name="IDS_LABS_LONG_TITLE" desc="Long version of the title for the chrome://labs page.">
-        Labs: Some crazy experimental stuff.
+      <message name="IDS_FLAGS_TABLE_TITLE" desc="Title for the experiments table on the about:flags page.">
+        Experiments
       </message>
-      <message name="IDS_LABS_TABLE_TITLE" desc="Title for the experiments table on the chrome://labs page.">
-        Labs Experiments
+      <message name="IDS_FLAGS_WARNING_HEADER" desc="Text right before the warning body text.">
+        WARNING
       </message>
-      <message name="IDS_LABS_BLURB" desc="Text at the top of the about:labs page, warning users that the about:labs contents are volatile.">
-        <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Labs is a testing ground for experimental features that aren't quite ready for primetime. They may change, break or disappear at any time. We make absolutely no guarantees about what may happen if you turn one of these experiments on. Your browser may spontaneously combust and/or acquire sentience.
+      <message name="IDS_FLAGS_WARNING_TEXT" desc="Text at the top of the about:flags page, warning users that the about:flags contents are volatile.">
+        These experimental features may change, break, or disappear at any time. We make absolutely no guarantees about what may happen if you turn one of these experiments on, and your browser may even spontaneously combust. Jokes aside, your browser may delete all your data, or your security and privacy could be compromised in unexpected ways. Please proceed with caution.
       </message>
-      <message name="IDS_LABS_NO_EXPERIMENTS_AVAILABLE" desc="Shown if no labs experiments are available">
+      <message name="IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE" desc="Shown if no experiments are available">
         Aww, it looks like there are currently no experiments available.
       </message>
-      <message name="IDS_LABS_RESTART_NOTICE" desc="Notifies the user that he needs to restart chrome. Shown next to a button that says 'Restart Now'.">
+      <message name="IDS_FLAGS_RESTART_NOTICE" desc="Notifies the user that he needs to restart chrome. Shown next to a button that says 'Restart Now'.">
         Your changes will take effect the next time you restart <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
       </message>
-      <message name="IDS_LABS_RESTART_BUTTON" desc="Text on a button that restarts chrome when clicked. ">
+      <message name="IDS_FLAGS_RESTART_BUTTON" desc="Text on a button that restarts chrome when clicked. ">
         Restart Now
       </message>
-      <message name="IDS_LABS_DISABLE" desc="The link for disabling a labs experiment.">
+      <message name="IDS_FLAGS_DISABLE" desc="The link for disabling a labs experiment.">
         Disable
       </message>
-      <message name="IDS_LABS_ENABLE" desc="The link for enabling a labs experiment.">
+      <message name="IDS_FLAGS_ENABLE" desc="The link for enabling a labs experiment.">
         Enable
       </message>
-      <message name="IDS_LABS_TABPOSE_NAME" desc="Name of the 'Tab Overview' lab.">
+      <message name="IDS_FLAGS_TABPOSE_NAME" desc="Name of the 'Tab Overview' lab.">
         Tab Overview
       </message>
-      <message name="IDS_LABS_TABPOSE_DESCRIPTION" desc="Description of the 'Tab Overview' lab.">
+      <message name="IDS_FLAGS_TABPOSE_DESCRIPTION" desc="Description of the 'Tab Overview' lab.">
         Swipe down with three fingers on your trackpad to see an overview of all your tabs. Click on a thumbnail to select it. Works great in fullscreen mode.
       </message>
-      <message name="IDS_LABS_SIDE_TABS_NAME" desc="Name of the 'Left Tabs' lab.">
+      <message name="IDS_FLAGS_SIDE_TABS_NAME" desc="Name of the 'Left Tabs' lab.">
         Side Tabs
       </message>
-      <message name="IDS_LABS_SIDE_TABS_DESCRIPTION" desc="Description of the 'Left Tabs' lab.">
+      <message name="IDS_FLAGS_SIDE_TABS_DESCRIPTION" desc="Description of the 'Left Tabs' lab.">
         Adds a "Use Side Tabs" entry to the tabstrip's context menu. Use this to toggle between tabs on top (default) and tabs on the side. Useful on widescreen monitors.
       </message>
-      <message name="IDS_LABS_TABBED_OPTIONS_NAME" desc="Description of the 'Tabbed Settings' lab.">
+      <message name="IDS_FLAGS_TABBED_OPTIONS_NAME" desc="Description of the 'Tabbed Settings' lab.">
         Tabbed Settings
       </message>
-      <message name="IDS_LABS_TABBED_OPTIONS_DESCRIPTION" desc="Description of the 'Tabbed Settings' lab.">
+      <message name="IDS_FLAGS_TABBED_OPTIONS_DESCRIPTION" desc="Description of the 'Tabbed Settings' lab.">
         Uses an in-tab UI for the Settings (Options/Preferences) dialog instead of a stand-alone window.
       </message>
-      <message name="IDS_LABS_INSTANT_NAME" desc="Description of the 'Instant' lab.">
+      <message name="IDS_FLAGS_INSTANT_NAME" desc="Description of the 'Instant' lab.">
         Instant
       </message>
-      <message name="IDS_LABS_INSTANT_DESCRIPTION" desc="Description of the 'Instant' lab.">
+      <message name="IDS_FLAGS_INSTANT_DESCRIPTION" desc="Description of the 'Instant' lab.">
         Makes the address bar load urls as you type.
       </message>
-      <message name="IDS_LABS_REMOTING_NAME" desc="Description of the 'Remoting' lab.">
+      <message name="IDS_FLAGS_REMOTING_NAME" desc="Description of the 'Remoting' lab.">
         Remoting
       </message>
-      <message name="IDS_LABS_REMOTING_CLIENT_DESCRIPTION" desc="Description of the 'Remoting' client lab.">
+      <message name="IDS_FLAGS_REMOTING_CLIENT_DESCRIPTION" desc="Description of the 'Remoting' client lab.">
         Enable Remoting Client support.
       </message>
-      <message name="IDS_LABS_REMOTING_HOST_DESCRIPTION" desc="Description of the 'Remoting' host lab.">
+      <message name="IDS_FLAGS_REMOTING_HOST_DESCRIPTION" desc="Description of the 'Remoting' host lab.">
         Enable Remoting Host support.
       </message>
-      <message name="IDS_LABS_DISABLE_OUTDATED_PLUGINS_NAME" desc="Name of the 'Disable outdated plug-ins' lab">
+      <message name="IDS_FLAGS_DISABLE_OUTDATED_PLUGINS_NAME" desc="Name of the 'Disable outdated plug-ins' lab">
         Disable outdated plug-ins
       </message>
-      <message name="IDS_LABS_DISABLE_OUTDATED_PLUGINS_DESCRIPTION" desc="Description of the 'Disable outdated plug-ins' lab">
+      <message name="IDS_FLAGS_DISABLE_OUTDATED_PLUGINS_DESCRIPTION" desc="Description of the 'Disable outdated plug-ins' lab">
         Automatically disables plug-ins with known security vulnerabilities and offers update links for them.
       </message>
-      <message name="IDS_LABS_XSS_AUDITOR_NAME" desc="Description of the 'XSS Auditor' lab.">
+      <message name="IDS_FLAGS_XSS_AUDITOR_NAME" desc="Description of the 'XSS Auditor' lab.">
         XSS Auditor
       </message>
-      <message name="IDS_LABS_XSS_AUDITOR_DESCRIPTION" desc="Description of the 'XSS Auditor' lab.">
+      <message name="IDS_FLAGS_XSS_AUDITOR_DESCRIPTION" desc="Description of the 'XSS Auditor' lab.">
         Enables WebKit's XSS Auditor (cross-site scripting protection). This feature aims to protect you from certain attacks of malicious web sites. It improves your security, but it might not be compatible with all web sites.
       </message>
-      <message name="IDS_LABS_BACKGROUND_WEBAPPS_NAME" desc="Name of the 'Background WebApps' lab.">
+      <message name="IDS_FLAGS_BACKGROUND_WEBAPPS_NAME" desc="Name of the 'Background WebApps' lab.">
         Background WebApps
       </message>
-      <message name="IDS_LABS_BACKGROUND_WEBAPPS_DESCRIPTION" desc="Description of the 'Background WebApps' lab.">
+      <message name="IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION" desc="Description of the 'Background WebApps' lab.">
         Allows installed web apps to run in the background at system startup and continue running after all windows are closed.
       </message>
-      <message name="IDS_LABS_CLOUD_PRINT_PROXY_NAME" desc="Title of the Cloud Print Proxy lab">
+      <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_NAME" desc="Title of the Cloud Print Proxy lab">
         Cloud Print Proxy
       </message>
-      <message name="IDS_LABS_CLOUD_PRINT_PROXY_DESCRIPTION" desc="Description of the Cloud Print Proxy lab">
+      <message name="IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION" desc="Description of the Cloud Print Proxy lab">
         Enables a background service that connects the <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> service to any printers installed on this computer. Once this lab is enabled, you can turn <ph name="CLOUD_PRINT_NAME">Google Cloud Print</ph> on by logging in with your Google account in the Options/Preferences in the Under the Hood section.
       </message>
-      <message name="IDS_LABS_ACCELERATED_COMPOSITING_NAME" desc="Name of the 'GPU Accelerated Compositing' lab.">
+      <message name="IDS_FLAGS_ACCELERATED_COMPOSITING_NAME" desc="Name of the 'GPU Accelerated Compositing' lab.">
         GPU Accelerated Compositing
       </message>
-      <message name="IDS_LABS_ACCELERATED_COMPOSITING_DESCRIPTION" desc="Description of the 'GPU Accelerated Compositing' lab.">
+      <message name="IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION" desc="Description of the 'GPU Accelerated Compositing' lab.">
         Enables 3D CSS and higher performance compositing of web pages using Graphics Processor Unit (GPU) hardware.
       </message>
-      <message name="IDS_LABS_ACCELERATED_CANVAS_2D_NAME" desc="Name of the 'GPU Accelerated Canvas 2D' lab.">
+      <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME" desc="Name of the 'GPU Accelerated Canvas 2D' lab.">
         GPU Accelerated Canvas 2D
       </message>
-      <message name="IDS_LABS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Description of the 'GPU Accelerated Canvas 2D' lab.">
+      <message name="IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION" desc="Description of the 'GPU Accelerated Canvas 2D' lab.">
         Enables higher performance of canvas tags with a 2D context by rendering using Graphics Processor Unit (GPU) hardware.
       </message>
-      <message name="IDS_LABS_WEBGL_NAME" desc="Name of the 'WebGL' lab.">
+      <message name="IDS_FLAGS_WEBGL_NAME" desc="Name of the 'WebGL' lab.">
         WebGL
       </message>
-      <message name="IDS_LABS_WEBGL_DESCRIPTION" desc="Description of the 'WebGL' lab.">
+      <message name="IDS_FLAGS_WEBGL_DESCRIPTION" desc="Description of the 'WebGL' lab.">
         Enables canvas elements to use 3D graphics via the WebGL API.
       </message>
-      <message name="IDS_LABS_PRINT_PREVIEW_NAME" desc="Name of the 'Print Preview' lab.">
+      <message name="IDS_FLAGS_PRINT_PREVIEW_NAME" desc="Name of the 'Print Preview' lab.">
         Print Preview
       </message>
-      <message name="IDS_LABS_PRINT_PREVIEW_DESCRIPTION" desc="Description of the 'Print Preview' lab.">
+      <message name="IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION" desc="Description of the 'Print Preview' lab.">
         Enables an in-tab preview of a print operation.
       </message>
 
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 9a75983..be8317a 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -101,9 +101,9 @@ const char kBlobInternalsPath[] = "blob-internals";
 const char kCreditsPath[] = "credits";
 const char kCachePath[] = "view-http-cache";
 const char kDnsPath[] = "dns";
+const char kFlagsPath[] = "flags";
 const char kGpuPath[] = "gpu";
 const char kHistogramsPath[] = "histograms";
-const char kLabsPath[] = "labs";
 const char kMemoryRedirectPath[] = "memory-redirect";
 const char kMemoryPath[] = "memory";
 const char kStatsPath[] = "stats";
@@ -134,9 +134,9 @@ const char *kAllAboutPaths[] = {
   kCachePath,
   kCreditsPath,
   kDnsPath,
+  kFlagsPath,
   kGpuPath,
   kHistogramsPath,
-  kLabsPath,
   kMemoryPath,
   kNetInternalsPath,
   kPluginsPath,
@@ -259,12 +259,12 @@ std::string AboutAbout() {
   html.append("<html><head><title>About Pages</title></head><body>\n");
   html.append("<h2>List of About pages</h2><ul>\n");
   for (size_t i = 0; i < arraysize(kAllAboutPaths); i++) {
-    if (kAllAboutPaths[i] == kLabsPath && !about_labs::IsEnabled())
+    if (kAllAboutPaths[i] == kFlagsPath && !about_labs::IsEnabled())
       continue;
     if (kAllAboutPaths[i] == kAppCacheInternalsPath ||
         kAllAboutPaths[i] == kBlobInternalsPath ||
         kAllAboutPaths[i] == kCachePath ||
-        kAllAboutPaths[i] == kLabsPath ||
+        kAllAboutPaths[i] == kFlagsPath ||
         kAllAboutPaths[i] == kNetInternalsPath ||
         kAllAboutPaths[i] == kPluginsPath) {
       html.append("<li><a href='chrome://");
@@ -1180,9 +1180,9 @@ bool WillHandleBrowserAboutURL(GURL* url, Profile* profile) {
 
   if (about_labs::IsEnabled()) {
     // Rewrite about:labs and about:vaporware to chrome://labs/.
-    if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutLabsURL) ||
+    if (LowerCaseEqualsASCII(url->spec(), chrome::kAboutFlagsURL) ||
         LowerCaseEqualsASCII(url->spec(), chrome::kAboutVaporwareURL)) {
-      *url = GURL(chrome::kChromeUILabsURL);
+      *url = GURL(chrome::kChromeUIFlagsURL);
       return true;
     }
   }
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc
index 5d74116..aebc186 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.cc
+++ b/chrome/browser/dom_ui/dom_ui_factory.cc
@@ -128,7 +128,7 @@ static DOMUIFactoryFunction GetDOMUIFactoryFunction(Profile* profile,
     return &NewDOMUI<HistoryUI>;
   if (url.host() == chrome::kChromeUIHistory2Host)
     return &NewDOMUI<HistoryUI2>;
-  if (about_labs::IsEnabled() && url.host() == chrome::kChromeUILabsHost)
+  if (about_labs::IsEnabled() && url.host() == chrome::kChromeUIFlagsHost)
     return &NewDOMUI<LabsUI>;
 #if defined(TOUCH_UI)
   if (url.host() == chrome::kChromeUIKeyboardHost)
@@ -266,7 +266,7 @@ RefCountedMemory* DOMUIFactory::GetFaviconResourceBytes(Profile* profile,
   if (page_url.host() == chrome::kChromeUIHistory2Host)
     return HistoryUI2::GetFaviconResourceBytes();
 
-  if (about_labs::IsEnabled() && page_url.host() == chrome::kChromeUILabsHost)
+  if (about_labs::IsEnabled() && page_url.host() == chrome::kChromeUIFlagsHost)
     return LabsUI::GetFaviconResourceBytes();
 
   if (page_url.host() == chrome::kChromeUISettingsHost)
diff --git a/chrome/browser/dom_ui/labs_ui.cc b/chrome/browser/dom_ui/labs_ui.cc
index 2e65a29..5164f53 100644
--- a/chrome/browser/dom_ui/labs_ui.cc
+++ b/chrome/browser/dom_ui/labs_ui.cc
@@ -36,7 +36,7 @@ namespace {
 class LabsUIHTMLSource : public ChromeURLDataManager::DataSource {
  public:
   LabsUIHTMLSource()
-      : DataSource(chrome::kChromeUILabsHost, MessageLoop::current()) {}
+      : DataSource(chrome::kChromeUIFlagsHost, MessageLoop::current()) {}
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
@@ -54,30 +54,30 @@ class LabsUIHTMLSource : public ChromeURLDataManager::DataSource {
 };
 
 void LabsUIHTMLSource::StartDataRequest(const std::string& path,
-                                           bool is_off_the_record,
-                                           int request_id) {
+                                        bool is_off_the_record,
+                                        int request_id) {
   // Strings used in the JsTemplate file.
   DictionaryValue localized_strings;
-  localized_strings.SetString("labsTitle",
-      l10n_util::GetStringUTF16(IDS_LABS_TITLE));
   localized_strings.SetString("labsLongTitle",
-      l10n_util::GetStringUTF16(IDS_LABS_LONG_TITLE));
+      l10n_util::GetStringUTF16(IDS_FLAGS_LONG_TITLE));
   localized_strings.SetString("labsTableTitle",
-      l10n_util::GetStringUTF16(IDS_LABS_TABLE_TITLE));
+      l10n_util::GetStringUTF16(IDS_FLAGS_TABLE_TITLE));
   localized_strings.SetString("labsNoExperimentsAvailable",
-      l10n_util::GetStringUTF16(IDS_LABS_NO_EXPERIMENTS_AVAILABLE));
+      l10n_util::GetStringUTF16(IDS_FLAGS_NO_EXPERIMENTS_AVAILABLE));
+  localized_strings.SetString("flagsWarningHeader", l10n_util::GetStringUTF16(
+      IDS_FLAGS_WARNING_HEADER));
   localized_strings.SetString("labsBlurb", l10n_util::GetStringFUTF16(
-      IDS_LABS_BLURB,
+      IDS_FLAGS_WARNING_TEXT,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings.SetString("labsRestartNotice", l10n_util::GetStringFUTF16(
-      IDS_LABS_RESTART_NOTICE,
+      IDS_FLAGS_RESTART_NOTICE,
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings.SetString("labsRestartButton",
-      l10n_util::GetStringUTF16(IDS_LABS_RESTART_BUTTON));
+      l10n_util::GetStringUTF16(IDS_FLAGS_RESTART_BUTTON));
   localized_strings.SetString("disable",
-      l10n_util::GetStringUTF16(IDS_LABS_DISABLE));
+      l10n_util::GetStringUTF16(IDS_FLAGS_DISABLE));
   localized_strings.SetString("enable",
-      l10n_util::GetStringUTF16(IDS_LABS_ENABLE));
+      l10n_util::GetStringUTF16(IDS_FLAGS_ENABLE));
 
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
 
diff --git a/chrome/browser/labs.cc b/chrome/browser/labs.cc
index 67be6ea..d9fb7c5 100644
--- a/chrome/browser/labs.cc
+++ b/chrome/browser/labs.cc
@@ -48,8 +48,8 @@ struct Experiment {
 const Experiment kExperiments[] = {
   {
     "expose-for-tabs",  // Do not change; see above.
-    IDS_LABS_TABPOSE_NAME,
-    IDS_LABS_TABPOSE_DESCRIPTION,
+    IDS_FLAGS_TABPOSE_NAME,
+    IDS_FLAGS_TABPOSE_DESCRIPTION,
     kOsMac,
 #if defined(OS_MACOSX)
     // The switch exists only on OS X.
@@ -60,27 +60,27 @@ const Experiment kExperiments[] = {
   },
   {
     "vertical-tabs",  // Do not change; see above.
-    IDS_LABS_SIDE_TABS_NAME,
-    IDS_LABS_SIDE_TABS_DESCRIPTION,
+    IDS_FLAGS_SIDE_TABS_NAME,
+    IDS_FLAGS_SIDE_TABS_DESCRIPTION,
     kOsWin,
     switches::kEnableVerticalTabs
   },
   {
     "tabbed-options",  // Do not change; see above.
-    IDS_LABS_TABBED_OPTIONS_NAME,
-    IDS_LABS_TABBED_OPTIONS_DESCRIPTION,
+    IDS_FLAGS_TABBED_OPTIONS_NAME,
+    IDS_FLAGS_TABBED_OPTIONS_DESCRIPTION,
     kOsAll,
     switches::kEnableTabbedOptions
   },
   {
     "remoting",  // Do not change; see above.
-    IDS_LABS_REMOTING_NAME,
+    IDS_FLAGS_REMOTING_NAME,
 #if defined(OS_WIN)
     // Windows only supports host functionality at the moment.
-    IDS_LABS_REMOTING_HOST_DESCRIPTION,
+    IDS_FLAGS_REMOTING_HOST_DESCRIPTION,
 #elif defined(OS_LINUX)
     // Linux only supports client functionality at the moment.
-    IDS_LABS_REMOTING_CLIENT_DESCRIPTION,
+    IDS_FLAGS_REMOTING_CLIENT_DESCRIPTION,
 #else
     // On other platforms, this lab isn't available at all.
     0,
@@ -90,29 +90,29 @@ const Experiment kExperiments[] = {
   },
   {
     "disable-outdated-plugins",  // Do not change; see above.
-    IDS_LABS_DISABLE_OUTDATED_PLUGINS_NAME,
-    IDS_LABS_DISABLE_OUTDATED_PLUGINS_DESCRIPTION,
+    IDS_FLAGS_DISABLE_OUTDATED_PLUGINS_NAME,
+    IDS_FLAGS_DISABLE_OUTDATED_PLUGINS_DESCRIPTION,
     kOsAll,
     switches::kDisableOutdatedPlugins
   },
   {
     "xss-auditor",  // Do not change; see above.
-    IDS_LABS_XSS_AUDITOR_NAME,
-    IDS_LABS_XSS_AUDITOR_DESCRIPTION,
+    IDS_FLAGS_XSS_AUDITOR_NAME,
+    IDS_FLAGS_XSS_AUDITOR_DESCRIPTION,
     kOsAll,
     switches::kEnableXSSAuditor
   },
   {
     "background-webapps", // Do not change; see above
-    IDS_LABS_BACKGROUND_WEBAPPS_NAME,
-    IDS_LABS_BACKGROUND_WEBAPPS_DESCRIPTION,
+    IDS_FLAGS_BACKGROUND_WEBAPPS_NAME,
+    IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION,
     kOsAll,
     switches::kEnableBackgroundMode
   },
   {
     "cloud-print-proxy", // Do not change; see above.
-    IDS_LABS_CLOUD_PRINT_PROXY_NAME,
-    IDS_LABS_CLOUD_PRINT_PROXY_DESCRIPTION,
+    IDS_FLAGS_CLOUD_PRINT_PROXY_NAME,
+    IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION,
 #if defined(GOOGLE_CHROME_BUILD)
     // For a Chrome build, we know we have a PDF plug-in, and so we'll
     // enable by platform as we get things working.
@@ -126,8 +126,8 @@ const Experiment kExperiments[] = {
   },
   {
     "match-preview",  // Do not change; see above.
-    IDS_LABS_INSTANT_NAME,
-    IDS_LABS_INSTANT_DESCRIPTION,
+    IDS_FLAGS_INSTANT_NAME,
+    IDS_FLAGS_INSTANT_DESCRIPTION,
     kOsMac,
     switches::kEnableMatchPreview
   },
@@ -135,15 +135,15 @@ const Experiment kExperiments[] = {
   // or pull it and the strings in generated_resources.grd by Dec 2010
   //{
   //  "gpu-compositing", // Do not change; see above
-  //  IDS_LABS_ACCELERATED_COMPOSITING_NAME,
-  //  IDS_LABS_ACCELERATED_COMPOSITING_DESCRIPTION,
+  //  IDS_FLAGS_ACCELERATED_COMPOSITING_NAME,
+  //  IDS_FLAGS_ACCELERATED_COMPOSITING_DESCRIPTION,
   //  kOsAll,
   //  switches::kDisableAcceleratedCompositing
   //},
   {
     "gpu-canvas-2d", // Do not change; see above
-    IDS_LABS_ACCELERATED_CANVAS_2D_NAME,
-    IDS_LABS_ACCELERATED_CANVAS_2D_DESCRIPTION,
+    IDS_FLAGS_ACCELERATED_CANVAS_2D_NAME,
+    IDS_FLAGS_ACCELERATED_CANVAS_2D_DESCRIPTION,
     kOsWin | kOsLinux,
     switches::kEnableAccelerated2dCanvas
   },
@@ -151,15 +151,15 @@ const Experiment kExperiments[] = {
   // or pull it and the strings in generated_resources.grd by Dec 2010
   //{
   //  "webgl", // Do not change; see above
-  //  IDS_LABS_WEBGL_NAME,
-  //  IDS_LABS_WEBGL_DESCRIPTION,
+  //  IDS_FLAGS_WEBGL_NAME,
+  //  IDS_FLAGS_WEBGL_DESCRIPTION,
   //  kOsAll,
   //  switches::kDisableExperimentalWebGL
   //}
   {
     "print-preview",  // Do not change; see above
-    IDS_LABS_PRINT_PREVIEW_NAME,
-    IDS_LABS_PRINT_PREVIEW_DESCRIPTION,
+    IDS_FLAGS_PRINT_PREVIEW_NAME,
+    IDS_FLAGS_PRINT_PREVIEW_DESCRIPTION,
     kOsAll,
     switches::kEnablePrintPreview
   }
diff --git a/chrome/browser/resources/labs.html b/chrome/browser/resources/labs.html
index 4d95e31..3f008ed 100644
--- a/chrome/browser/resources/labs.html
+++ b/chrome/browser/resources/labs.html
@@ -2,7 +2,6 @@
 <html i18n-values="dir:textdirection;">
 <head>
 <meta charset="utf-8">
-<title i18n-content="labsTitle"></title>
 <style>
 body {
   margin: 10px;
@@ -52,8 +51,14 @@ h1 {
   margin: 0;
 }
 
-div.blurb {
+#blurb-container {
   padding-bottom: 1.5em;
+  font-size: 120%;
+}
+
+#blurb-warning {
+  color: red;
+  font-weight: bold;
 }
 
 div.content {
@@ -236,7 +241,10 @@ document.addEventListener('DOMContentLoaded', requestLabsExperimentsData);
 
   <div id="header"><h1 i18n-content="labsLongTitle">TITLE</h1></div>
 
-  <div class="blurb" i18n-content="labsBlurb">BLURB</div>
+  <div id="blurb-container">
+    <span id="blurb-warning" i18n-content="flagsWarningHeader">WARNING</span>
+    <span i18n-content="labsBlurb">WARNING TEXT</span>
+  </div>
 
   <div id="labsExperimentTemplate">
 
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index ab3309f..55420a7 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -49,11 +49,11 @@ const char kAboutCacheURL[] = "about:cache";
 const char kAboutCrashURL[] = "about:crash";
 const char kAboutCreditsURL[] = "about:credits";
 const char kAboutDNSURL[] = "about:dns";
+const char kAboutFlagsURL[] = "about:flags";
 const char kAboutGpuCrashURL[] = "about:gpucrash";
 const char kAboutGpuHangURL[] = "about:gpuhang";
 const char kAboutHangURL[] = "about:hang";
 const char kAboutHistogramsURL[] = "about:histograms";
-const char kAboutLabsURL[] = "about:labs";
 const char kAboutMemoryURL[] = "about:memory";
 const char kAboutNetInternalsURL[] = "about:net-internals";
 const char kAboutPluginsURL[] = "about:plugins";
@@ -74,11 +74,11 @@ const char kChromeUIDevToolsURL[] = "chrome://devtools/";
 const char kChromeUIDownloadsURL[] = "chrome://downloads/";
 const char kChromeUIExtensionsURL[] = "chrome://extensions/";
 const char kChromeUIFavIconURL[] = "chrome://favicon/";
+const char kChromeUIFlagsURL[] = "chrome://flags/";
 const char kChromeUIHistory2URL[] = "chrome://history2/";
 const char kChromeUIHistoryURL[] = "chrome://history/";
 const char kChromeUIIPCURL[] = "chrome://about/ipc";
 const char kChromeUIKeyboardURL[] = "chrome://keyboard/";
-const char kChromeUILabsURL[] = "chrome://labs/";
 const char kChromeUINewTabURL[] = "chrome://newtab";
 const char kChromeUIPluginsURL[] = "chrome://plugins/";
 const char kChromeUIPrintURL[] = "chrome://print/";
@@ -102,11 +102,11 @@ const char kChromeUIDialogHost[] = "dialog";
 const char kChromeUIDownloadsHost[] = "downloads";
 const char kChromeUIExtensionsHost[] = "extensions";
 const char kChromeUIFavIconHost[] = "favicon";
+const char kChromeUIFlagsHost[] = "flags";
 const char kChromeUIHistoryHost[] = "history";
 const char kChromeUIHistory2Host[] = "history2";
 const char kChromeUIInspectorHost[] = "inspector";
 const char kChromeUIKeyboardHost[] = "keyboard";
-const char kChromeUILabsHost[] = "labs";
 const char kChromeUINetInternalsHost[] = "net-internals";
 const char kChromeUINewTabHost[] = "newtab";
 const char kChromeUIPluginsHost[] = "plugins";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 12d2bc2..77aa367 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -44,11 +44,11 @@ extern const char kAboutCacheURL[];
 extern const char kAboutCrashURL[];
 extern const char kAboutCreditsURL[];
 extern const char kAboutDNSURL[];
+extern const char kAboutFlagsURL[];
 extern const char kAboutGpuCrashURL[];
 extern const char kAboutGpuHangURL[];
 extern const char kAboutHangURL[];
 extern const char kAboutHistogramsURL[];
-extern const char kAboutLabsURL[];
 extern const char kAboutMemoryURL[];
 extern const char kAboutNetInternalsURL[];
 extern const char kAboutPluginsURL[];
@@ -66,12 +66,12 @@ extern const char kChromeUIBugReportURL[];
 extern const char kChromeUIDevToolsURL[];
 extern const char kChromeUIDownloadsURL[];
 extern const char kChromeUIExtensionsURL[];
+extern const char kChromeUIFlagsURL[];
 extern const char kChromeUIFavIconURL[];
 extern const char kChromeUIHistory2URL[];
 extern const char kChromeUIHistoryURL[];
 extern const char kChromeUIIPCURL[];
 extern const char kChromeUIKeyboardURL[];
-extern const char kChromeUILabsURL[];
 extern const char kChromeUINewTabURL[];
 extern const char kChromeUIPluginsURL[];
 extern const char kChromeUIPrintURL[];
@@ -96,11 +96,11 @@ extern const char kChromeUIDialogHost[];
 extern const char kChromeUIDownloadsHost[];
 extern const char kChromeUIExtensionsHost[];
 extern const char kChromeUIFavIconHost[];
+extern const char kChromeUIFlagsHost[];
 extern const char kChromeUIHistory2Host[];
 extern const char kChromeUIHistoryHost[];
 extern const char kChromeUIInspectorHost[];
 extern const char kChromeUIKeyboardHost[];
-extern const char kChromeUILabsHost[];
 extern const char kChromeUINetInternalsHost[];
 extern const char kChromeUINewTabHost[];
 extern const char kChromeUIPluginsHost[];