Platform WebUnitTestSupport onion soup: remove more indirect methods

third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/graphics/BitmapImage.h"
 
 #include "platform/SharedBuffer.h"
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/testing/UnitTestHelpers.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebUnitTestSupport.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class BitmapImageTest : public ::testing::Test {
 public:
     class FakeImageObserver : public ImageObserver {
     public:
         FakeImageObserver() : m_lastDecodedSizeChangedDelta(0) { }
 
@@ skipping 10 matching lines @@
         int m_lastDecodedSizeChangedDelta;
     };
 
     BitmapImageTest() : BitmapImageTest(false) { }
     BitmapImageTest(bool enableDeferredDecoding) : m_enableDeferredDecoding(enableDeferredDecoding) { }
 
     static PassRefPtr<SharedBuffer> readFile(const char* fileName)
     {
         String filePath = testing::blinkRootDir();
         filePath.append(fileName);
-        return Platform::current()->unitTestSupport()->readFromFile(filePath);
+        return testing::readFromFile(filePath);
     }
 
     // Accessors to BitmapImage's protected methods.
     void destroyDecodedData(bool destroyAll) { m_image->destroyDecodedData(destroyAll); }
     size_t frameCount() { return m_image->frameCount(); }
     void frameAtIndex(size_t index)
     {
         m_image->frameAtIndex(index);
     }
     void setCurrentFrame(size_t frame) { m_image->m_currentFrame = frame; }
@@ skipping 183 matching lines @@
     frameAtIndex(0);
 
     // Trying to destroy all data except an undecoded frame should go ahead and
     // destroy all other frames.
     setCurrentFrame(2);
     destroyDecodedData(false);
     EXPECT_EQ(-frameSize * 2, m_imageObserver.m_lastDecodedSizeChangedDelta);
 }
 
 } // namespace blink