Revert of Temporarily switch the compiler back to VS2013 on DrMemory bots.

masters/master.chromium.memory.fyi/master.cfg

 # Copyright (c) 2012 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.
 
 from buildbot.scheduler import Triggerable
 from buildbot.scheduler import Scheduler
 
 from common import chromium_utils
 
 # These modules come from scripts/master, which must be in the PYTHONPATH.
@@ skipping 310 matching lines @@
 f_chromium_rel_win_drmemory_builder = F_WIN_NINJA(
     # TODO(timurrrr): reuse the builder for TSan/Win too once
     # http://crbug.com/108155 is resolved.
     slave_type='Builder',
     target='Release',
     # TODO(bruening): remove "_dbg" from this name in all.gyp as it is
     # not limited to just Debug.
     # TODO(timurrrr): Might wanna remove chromium_builder_dbg_drmemory_win
     # entirely as ninja supports target lists similar to what we always had
     # on Linux.
-    # TODO(zhaoqin|bruening): Temporarily using VS2013 due to bugs in DrMemory.
-    # crbug.com/594808.
     options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'],
     factory_properties={
       'gclient_env': {'GYP_DEFINES': ('build_for_tool=drmemory '
                                       'component=shared_library '),
-                      'GYP_MSVS_VERSION': '2013',
                       'GYP_GENERATORS': 'ninja'},
       'package_pdb_files': True,
       'trigger': 'chromium_win_drmemory',
       'build_url': chromium_win_drmemory_archive,
     }
 )
 
 f_chromium_rel_win_drmemory = F_WIN_NINJA(
     slave_type='Tester',
     target='Release',
@@ skipping 173 matching lines @@
     ],
     factory_properties={'halt_on_missing_build': True},
 )
 
 # DrMemory x64 Builder
 f_chromium_rel_win_drmemory_64_builder = F_WIN_NINJA(
     slave_type='Builder',
     target='Release_x64',
     # TODO(bruening): remove "_dbg" from this name in all.gyp as it is
     # not limited to just Debug.
-    # TODO(zhaoqin|bruening): Temporarily using VS2013 due to bugs in DrMemory.
-    # crbug.com/594808.
     options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES' : (
             'build_for_tool=drmemory component=shared_library '
             'target_arch=x64'),
-        'GYP_MSVS_VERSION': '2013',
         'GYP_GENERATORS': 'ninja',
       },
       'package_pdb_files': True,
       'trigger': 'chromium_win_drmemory_64',
       'build_url': chromium_win_drmemory_64_archive,
     }
 )
 
 # Windows Unit (DrMemory x64)
 f_chromium_rel_win_drmemory_64 = F_WIN_NINJA(
@@ skipping 458 matching lines @@
 # Adds common status and tools to this master.
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html='../master.chromium/public_html',
     templates=['../master.chromium/templates'],
     tagComparator=master_poller.comparator,
     enable_http_status_push=ActiveMaster.is_production_host)
 
 if ActiveMaster.is_production_host:
   import notifier_cfg
   notifier_cfg.Update(config, ActiveMaster, c)