Update from https://crrev.com/316786

cc/resources/tile.h

Index: cc/resources/tile.h
diff --git a/cc/resources/tile.h b/cc/resources/tile.h
index 2394dcb6be11cab18a319f39ec3682943e28485b..698f43da27afe7d54ef6a10cefc8549e5abc8dae 100644
--- a/cc/resources/tile.h
+++ b/cc/resources/tile.h
@@ -68,18 +68,8 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
   void set_shared(bool is_shared) { is_shared_ = is_shared; }
   bool is_shared() const { return is_shared_; }
 
-  bool is_occluded_for_tree_priority(TreePriority tree_priority) const {
-    switch (tree_priority) {
-      case SMOOTHNESS_TAKES_PRIORITY:
-        return is_occluded_[ACTIVE_TREE];
-      case NEW_CONTENT_TAKES_PRIORITY:
-        return is_occluded_[PENDING_TREE];
-      case SAME_PRIORITY_FOR_BOTH_TREES:
-        return is_occluded_[ACTIVE_TREE] && is_occluded_[PENDING_TREE];
-      default:
-        NOTREACHED();
-        return false;
-    }
+  bool is_occluded_combined() const {
+    return is_occluded_[ACTIVE_TREE] && is_occluded_[PENDING_TREE];
   }
 
   // TODO(vmpstr): Move this to the iterators.
@@ -102,7 +92,7 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
            !draw_info_.IsReadyToDraw();
   }
 
-  void AsValueInto(base::debug::TracedValue* dict) const;
+  void AsValueInto(base::trace_event::TracedValue* dict) const;
 
   inline bool IsReadyToDraw() const { return draw_info_.IsReadyToDraw(); }