Update from https://crrev.com/312600

cc/test/fake_picture_layer_impl.h

 // Copyright 2013 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.
 
 #ifndef CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_
 #define CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/picture_layer_impl.h"
 
@@ skipping 59 matching lines @@
 
   size_t CountTilesRequired(
       TileRequirementCheck is_tile_required_callback) const;
   size_t CountTilesRequiredForActivation() const;
   size_t CountTilesRequiredForDraw() const;
 
   using PictureLayerImpl::AddTiling;
   using PictureLayerImpl::CleanUpTilingsOnActiveLayer;
   using PictureLayerImpl::CanHaveTilings;
   using PictureLayerImpl::MinimumContentsScale;
-  using PictureLayerImpl::GetViewportForTilePriorityInContentSpace;
   using PictureLayerImpl::SanityCheckTilingState;
   using PictureLayerImpl::GetRecycledTwinLayer;
   using PictureLayerImpl::UpdateRasterSource;
 
   using PictureLayerImpl::UpdateIdealScales;
   using PictureLayerImpl::MaximumTilingContentsScale;
 
   float raster_page_scale() const { return raster_page_scale_; }
   void set_raster_page_scale(float scale) { raster_page_scale_ = scale; }
 
@@ skipping 10 matching lines @@
                                 const Region& invalidation);
   size_t append_quads_count() { return append_quads_count_; }
 
   const Region& invalidation() const { return invalidation_; }
   void set_invalidation(const Region& region) { invalidation_ = region; }
 
   gfx::Rect visible_rect_for_tile_priority() {
     return visible_rect_for_tile_priority_;
   }
 
+  gfx::Rect viewport_rect_for_tile_priority_in_content_space() {
+    return viewport_rect_for_tile_priority_in_content_space_;
+  }
+
   void set_fixed_tile_size(const gfx::Size& size) { fixed_tile_size_ = size; }
 
   void CreateAllTiles();
   void SetAllTilesVisible();
   void SetAllTilesReady();
   void SetAllTilesReadyInTiling(PictureLayerTiling* tiling);
   void SetTileReady(Tile* tile);
   void ResetAllTilesPriorities();
   PictureLayerTilingSet* GetTilings() { return tilings_.get(); }
 
@@ skipping 24 matching lines @@
   size_t append_quads_count_;
   size_t did_become_active_call_count_;
   bool has_valid_tile_priorities_;
   bool use_set_valid_tile_priorities_flag_;
   size_t release_resources_count_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TEST_FAKE_PICTURE_LAYER_IMPL_H_