Remove expectations / -r from DM entirely.

gyp/dm.gypi

 # GYP for "dm" (Diamond Master, a.k.a Dungeon master, a.k.a GM 2).
 {
   'include_dirs': [
     '../dm',
     '../gm',
     '../tests',
     '../src/images',
     '../src/lazy',
     '../src/core',
     '../src/effects',
@@ skipping 12 matching lines @@
     'tools.gyp:sk_tool_utils',
   ],
   'includes': [
     'gmslides.gypi',
     'pathops_unittest.gypi',
     'tests.gypi',
   ],
   'sources': [
     '../dm/DM.cpp',
     '../dm/DMCpuGMTask.cpp',
-    '../dm/DMExpectationsTask.cpp',
     '../dm/DMGpuGMTask.cpp',
     '../dm/DMPDFRasterizeTask.cpp',
     '../dm/DMPDFTask.cpp',
     '../dm/DMPipeTask.cpp',
     '../dm/DMQuiltTask.cpp',
     '../dm/DMReporter.cpp',
     '../dm/DMSKPTask.cpp',
     '../dm/DMSerializeTask.cpp',
     '../dm/DMTask.cpp',
     '../dm/DMTaskRunner.cpp',
     '../dm/DMTestTask.cpp',
     '../dm/DMUtil.cpp',
     '../dm/DMWriteTask.cpp',
     '../gm/gm.cpp',
-    '../gm/gm_expectations.cpp',
 
     '../src/utils/SkTaskGroup.cpp',
 
     '../src/pipe/utils/SamplePipeControllers.cpp',
     '../src/utils/debugger/SkDebugCanvas.cpp',
     '../src/utils/debugger/SkDrawCommand.cpp',
     '../src/utils/debugger/SkObjectParser.cpp',
     '../tools/LazyDecodeBitmap.cpp',
   ],
   'conditions': [
     [ 'skia_gpu == 1', {
       'dependencies': [ 'gputest.gyp:skgputest' ],
     }],
   ],
 }