Revert of Add a PGO tag for the PGO builds in chrome://version (patchset #3...

Revert of Add a PGO tag for the PGO builds in chrome://version (patchset #3 id:40001 of https://codereview.chromium.org/2157563002/ )

Reason for revert:
It's breaking a chromiumos bot: https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/23038

Original issue's description:
> Add a PGO tag for the PGO builds in chrome://version
>
> Also remove the VS2013 version string as we don't support it anymore.
>
> BUG=309849
>
> Committed: https://crrev.com/cbb31e640ae7ee7a9e03df917d5bba25415c13f0
> Cr-Commit-Position: refs/heads/master@{#406119}

TBR=brucedawson@chromium.org,sky@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=309849

Review-Url: https://codereview.chromium.org/2160013003
Cr-Commit-Position: refs/heads/master@{#406127}

chrome/browser/ui/webui/version_ui.cc

@@ -136,11 +136,9 @@ WebUIDataSource* CreateVersionUIDataSource() {
 #if defined(__clang__)
   html_source->AddString("compiler", "clang");
 #elif defined(_MSC_VER) && _MSC_VER == 1900
-#if BUILDFLAG(PGO_BUILD)
-  html_source->AddString("compiler", "MSVC 2015 (PGO)");
-#else
   html_source->AddString("compiler", "MSVC 2015");
-#endif
+#elif defined(_MSC_VER) && _MSC_VER == 1800
+  html_source->AddString("compiler", "MSVC 2013");
 #elif defined(_MSC_VER)
 #error "Unsupported version of MSVC."
 #else

chrome/chrome_features.gyp

@@ -20,7 +20,6 @@
           'ANDROID_JAVA_UI=<(android_java_ui)',
           'USE_VULCANIZE=<(use_vulcanize)',
           'ENABLE_PACKAGE_MASH_SERVICES=<(enable_package_mash_services)',
-          'PGO_BUILD=<(pgo_build)',
         ],
       },
     },

chrome/chrome_features.gypi

@@ -21,11 +21,6 @@
         }, {
           'enable_background%': 1,
           'enable_google_now%': 1,
-        }],
-        ['chrome_pgo_phase!=0', {
-          'pgo_build%': 1,
-        }, {
-          'pgo_build%': 0,
         }]
       ],
 
@@ -40,7 +35,6 @@
     'enable_google_now%': '<(enable_google_now)',
     'android_java_ui%': '<(android_java_ui)',
     'use_vulcanize%': '<(use_vulcanize)',
-    'pgo_build%': '<(pgo_build)',
 
     # GN only, but defined here so BUILDFLAG works without ifdef.
     'enable_package_mash_services%': 0,

chrome/common/BUILD.gn

@@ -47,7 +47,6 @@ buildflag_header("features") {
     "ENABLE_ONE_CLICK_SIGNIN=$enable_one_click_signin",
     "ENABLE_PACKAGE_MASH_SERVICES=$enable_package_mash_services",
     "USE_VULCANIZE=$use_vulcanize",
-    "PGO_BUILD=$pgo_build",
   ]
 }
 

chrome/common/features.gni

@@ -6,7 +6,6 @@
 # Please keep in sync!
 
 import("//build/config/chromecast_build.gni")
-import("//build/config/compiler/compiler.gni")
 
 declare_args() {
   enable_google_now = !is_ios && !is_android && !is_chromecast
@@ -30,9 +29,6 @@ declare_args() {
   # Set to true to bundle all the mash related mojo services into chrome.
   # Specify --mash to chrome to have chrome start the mash environment.
   enable_package_mash_services = is_chromeos
-
-  # Indicates if the build is using PGO.
-  pgo_build = chrome_pgo_phase > 0
 }
 
 chrome_grit_defines = [