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

chrome/browser/about_flags.cc

 // Copyright (c) 2011 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 278 matching lines @@
     SINGLE_VALUE_TYPE(switches::kEnableTabGroupsContextMenu)
   },
   {
     "ppapi-flash-in-process",
     IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_NAME,
     IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION,
     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,
     IDS_FLAGS_MULTI_PROFILES_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kMultiProfiles)
   },
   {
     "restrict-instant-to-search",
     IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_NAME,
     IDS_FLAGS_RESTRICT_INSTANT_TO_SEARCH_DESCRIPTION,
@@ skipping 440 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags