Reset PIXEL_UNPACK_BUFFER at texture manager initialization time

gpu/command_buffer/service/test_helper.cc

Index: gpu/command_buffer/service/test_helper.cc
diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index 956ff3c608a4c407b16a6b225e24194eac0cf007..89224142d9d653ecc0d4fe50762c2d901dfeab8a 100644
--- a/gpu/command_buffer/service/test_helper.cc
+++ b/gpu/command_buffer/service/test_helper.cc
@@ -205,11 +205,18 @@ void TestHelper::SetupTextureInitializationExpectations(
 void TestHelper::SetupTextureManagerInitExpectations(
     ::gl::MockGLInterface* gl,
     bool is_es3_enabled,
+    bool is_es3_capable,
     bool is_desktop_core_profile,
     const char* extensions,
     bool use_default_textures) {
   InSequence sequence;
 
+  if (is_es3_capable) {
+    EXPECT_CALL(*gl, BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0))
+        .Times(1)
+        .RetiresOnSaturation();
+  }
+
   SetupTextureInitializationExpectations(
       gl, GL_TEXTURE_2D, use_default_textures);
   SetupTextureInitializationExpectations(
@@ -467,8 +474,8 @@ void TestHelper::SetupContextGroupInitExpectations(
 
   bool use_default_textures = bind_generates_resource;
   SetupTextureManagerInitExpectations(
-      gl, false, gl_info.is_desktop_core_profile, extensions,
-      use_default_textures);
+      gl, false, gl_info.is_es3_capable, gl_info.is_desktop_core_profile,
+      extensions, use_default_textures);
 }
 
 void TestHelper::SetupFeatureInfoInitExpectations(::gl::MockGLInterface* gl,