Revert 247793 "Ensure GL initialization only happens once, and p..."

trunk/src/content/browser/compositor/software_output_device_ozone_unittest.cc

 // Copyright 2014 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.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/software_frame_data.h"
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
@@ skipping 63 matching lines @@
 
  private:
   scoped_ptr<ui::Compositor> compositor_;
   scoped_ptr<base::MessageLoop> message_loop_;
   scoped_ptr<gfx::SurfaceFactoryOzone> surface_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDeviceOzoneTest);
 };
 
 SoftwareOutputDeviceOzoneTest::SoftwareOutputDeviceOzoneTest() {
+  CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL));
   message_loop_.reset(new base::MessageLoopForUI);
 }
 
 SoftwareOutputDeviceOzoneTest::~SoftwareOutputDeviceOzoneTest() {
 }
 
 void SoftwareOutputDeviceOzoneTest::SetUp() {
   ui::InitializeContextFactoryForTests(false);
   ui::Compositor::Initialize();
 
@@ skipping 92 matching lines @@
   // painted.
   for (int i = 0; i < area.height(); ++i) {
     for (int j = 0; j < area.width(); ++j) {
       if (j < damage.width() && i < damage.height())
         EXPECT_EQ(SK_ColorWHITE, bitmap.getColor(j, i));
       else
         EXPECT_EQ(SK_ColorBLACK, bitmap.getColor(j, i));
     }
   }
 }