Clean LayerImpl's scroll offset callers in unit tests.

cc/test/layer_tree_test.h

 // Copyright 2011 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_LAYER_TREE_TEST_H_
 #define CC_TEST_LAYER_TREE_TEST_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread.h"
 #include "cc/animation/animation_delegate.h"
@@ skipping 173 matching lines @@
   virtual scoped_ptr<FakeOutputSurface> CreateFakeOutputSurface();
 
   TestWebGraphicsContext3D* TestContext();
 
   TestGpuMemoryBufferManager* GetTestGpuMemoryBufferManager() {
     return gpu_memory_buffer_manager_.get();
   }
 
   bool IsRemoteTest() const;
 
+  static gfx::Vector2dF ScrollDelta(LayerImpl* layer_impl) {
+    if (layer_impl->IsActive())
+      return gfx::Vector2dF(layer_impl->synced_scroll_offset()->Delta().x(),
+                            layer_impl->synced_scroll_offset()->Delta().y());
+    else
+      return gfx::Vector2dF(
+          layer_impl->synced_scroll_offset()->PendingDelta().get().x(),
+          layer_impl->synced_scroll_offset()->PendingDelta().get().y());
+  }
+
  private:
   LayerTreeSettings settings_;
   LayerSettings layer_settings_;
 
   CompositorMode mode_;
 
   scoped_ptr<LayerTreeHostClientForTesting> client_;
   scoped_ptr<LayerTreeHost> layer_tree_host_;
 
   // The LayerTreeHost created by the cc embedder on the client in remote mode.
@@ skipping 76 matching lines @@
 #define SINGLE_AND_MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)            \
   SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(TEST_FIXTURE_NAME); \
   SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(TEST_FIXTURE_NAME)
 
 // Some tests want to control when notify ready for activation occurs,
 // but this is not supported in the single-threaded case.
 #define MULTI_THREAD_BLOCKNOTIFY_TEST_F(TEST_FIXTURE_NAME) \
   MULTI_THREAD_TEST_F(TEST_FIXTURE_NAME)
 
 #endif  // CC_TEST_LAYER_TREE_TEST_H_