Fix gpu_ipc_service_unittests on mac_chromium_rel_ng by managing GL shared groups the same way in s…

gpu/ipc/service/gpu_command_buffer_stub.cc

 // Copyright (c) 2012 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 "gpu/ipc/service/gpu_command_buffer_stub.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 21 matching lines @@
 #include "gpu/ipc/common/gpu_messages.h"
 #include "gpu/ipc/service/gpu_channel.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
 #include "gpu/ipc/service/gpu_memory_manager.h"
 #include "gpu/ipc/service/gpu_memory_tracking.h"
 #include "gpu/ipc/service/gpu_watchdog.h"
 #include "gpu/ipc/service/image_transport_surface.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_image.h"
+#include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "gpu/ipc/service/stream_texture_android.h"
 #endif
 
@@ skipping 504 matching lines @@
     OnInitializeFailed(reply_message);
     return;
   }
 
   scoped_refptr<gfx::GLContext> context;
   gfx::GLShareGroup* share_group = channel_->share_group();
   if (use_virtualized_gl_context_ && share_group) {
     context = share_group->GetSharedContext();
     if (!context.get()) {
       context = gfx::GLContext::CreateGLContext(
-          channel_->share_group(),
+          share_group,
           channel_->gpu_channel_manager()->GetDefaultOffscreenSurface(),
           gpu_preference_);
       if (!context.get()) {
         DLOG(ERROR) << "Failed to create shared context for virtualization.";
         OnInitializeFailed(reply_message);
         return;
       }
-      channel_->share_group()->SetSharedContext(context.get());
+      // Ensure that context creation did not lose track of the intended
+      // share_group.
+      DCHECK(context->share_group() == share_group);
+      share_group->SetSharedContext(context.get());
     }
-    // This should be a non-virtual GL context.
-    DCHECK(context->GetHandle());
+    // This should be either:
+    // (1) a non-virtual GL context, or
+    // (2) a mock context.
+    DCHECK(context->GetHandle() ||
+           gfx::GetGLImplementation() == gfx::kGLImplementationMockGL);
     context = new GLContextVirtual(
         share_group, context.get(), decoder_->AsWeakPtr());
     if (!context->Initialize(surface_.get(), gpu_preference_)) {
       // The real context created above for the default offscreen surface
       // might not be compatible with this surface.
       context = NULL;
 
       DLOG(ERROR) << "Failed to initialize virtual GL context.";
       OnInitializeFailed(reply_message);
       return;
@@ skipping 538 matching lines @@
                                                     result));
 }
 
 void GpuCommandBufferStub::SendUpdateVSyncParameters(base::TimeTicks timebase,
                                                      base::TimeDelta interval) {
   Send(new GpuCommandBufferMsg_UpdateVSyncParameters(route_id_, timebase,
                                                      interval));
 }
 
 }  // namespace gpu