cc: CHECK surface invariants in LayerTreeHost on all platforms

This is an option now that aura::WindowTreeHost have been fixed

Bug: 818085
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Change-Id: I074ade34758a5005862543549e4bbe69838301b9
Reviewed-on: https://chromium-review.googlesource.com/959550
Commit-Queue: ccameron <ccameron@chromium.org>
Reviewed-by: Fady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543656}

cc/trees/layer_tree_host.cc

@@ -28,7 +28,6 @@
 #include "base/timer/elapsed_timer.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_argument.h"
-#include "build/build_config.h"
 #include "cc/base/devtools_instrumentation.h"
 #include "cc/base/histograms.h"
 #include "cc/base/math_util.h"
@@ -1080,11 +1079,7 @@ void LayerTreeHost::SetViewportSizeAndScale(
   if (changed) {
     SetPropertyTreesNeedRebuild();
     SetNeedsCommit();
-#if defined(OS_MACOSX)
-    // TODO(ccameron): This check is not valid on Aura or Mus yet, but should
-    // be.
     CHECK(!has_pushed_local_surface_id_ || !local_surface_id_.is_valid());
-#endif
   }
 }
 

testing/buildbot/filters/mash.ash_unittests.filter

@@ -89,6 +89,8 @@
 -HighlighterControllerTest.HighlighterGesturesScaled
 # Test is flaky. http://crbug.com/817327.
 -HighlighterControllerTest.HighlighterGesturesRotated
+# Test fails due to DSF routing bug https://crbug.com/821535
+-HighlighterControllerTest.SelectionInsideScreen
 
 # TODO: Top-of-screen mouse reveal doesn't work, maybe problem with
 # EventGenerator. http://crbug.com/698085