Revert 86642 - Remove --enable-vpn (enabled always)

BUG=none
TEST='Private networks' option should always show up in ChromeOS Networks menu.

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

TBR=stevenjb@google.com
Review URL: http://codereview.chromium.org/7053015

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

chrome/browser/about_flags.cc

@@ -295,6 +295,18 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kPpapiFlashInProcess)
   },
+  {
+    "enable-vpn",
+    IDS_FLAGS_ENABLE_VPN_NAME,
+    IDS_FLAGS_ENABLE_VPN_DESCRIPTION,
+    kOsCrOS,
+#if defined(OS_CHROMEOS)
+    // The switch exists only on Chrome OS.
+    SINGLE_VALUE_TYPE(switches::kEnableVPN)
+#else
+    SINGLE_VALUE_TYPE("")
+#endif
+  },
   {
     "multi-profiles",
     IDS_FLAGS_MULTI_PROFILES_NAME,

chrome/browser/chromeos/status/network_menu.cc

@@ -780,17 +780,19 @@ void MainMenuModel::InitMenuItems(bool is_browser_mode,
         SkBitmap(), std::string(), FLAG_DISABLED));
   }
 
-  // If there's a connected network, add submenu for Private Networks.
-  const Network* connected_network = cros->connected_network();
-  if (connected_network) {
-    menu_items_.push_back(MenuItem());  // Separator
-    menu_items_.push_back(MenuItem(
-        ui::MenuModel::TYPE_SUBMENU,
-        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
-        VPNMenuModel::IconForDisplay(connected_network),
-        vpn_menu_model_.get(), FLAG_NONE));
-    vpn_menu_model_->InitMenuItems(
-        is_browser_mode, should_open_button_options);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableVPN)) {
+    // If there's a connected network, add submenu for Private Networks.
+    const Network* connected_network = cros->connected_network();
+    if (connected_network) {
+      menu_items_.push_back(MenuItem());  // Separator
+      menu_items_.push_back(MenuItem(
+          ui::MenuModel::TYPE_SUBMENU,
+          l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
+          VPNMenuModel::IconForDisplay(connected_network),
+          vpn_menu_model_.get(), FLAG_NONE));
+      vpn_menu_model_->InitMenuItems(
+          is_browser_mode, should_open_button_options);
+    }
   }
 
   // Enable / disable wireless.

chrome/common/chrome_switches.cc

@@ -1020,6 +1020,9 @@ const char kDOMLogin[]                      = "dom-login";
 // Enables device policy support on ChromeOS.
 const char kEnableDevicePolicy[]            = "enable-device-policy";
 
+// Enables VPN support on ChromeOS.
+const char kEnableVPN[]                     = "enable-vpn";
+
 // Enable the redirection of viewable document requests to the Google
 // Document Viewer.
 const char kEnableGView[]                   = "enable-gview";

chrome/common/chrome_switches.h

@@ -282,6 +282,7 @@ extern const char kWinHttpProxyResolver[];
 #if defined(OS_CHROMEOS)
 extern const char kDOMLogin[];
 extern const char kEnableDevicePolicy[];
+extern const char kEnableVPN[];
 extern const char kEnableGView[];
 extern const char kEnableLoginImages[];
 extern const char kLoginManager[];