Improve indexed gl state related GL commands.

gpu/command_buffer/service/context_state.cc

Index: gpu/command_buffer/service/context_state.cc
diff --git a/gpu/command_buffer/service/context_state.cc b/gpu/command_buffer/service/context_state.cc
index 6a2ae014b993626d98ab5a10b37c13eb73073b42..f909d0fbf3595dd4ef197d8445b92ef5a3576302 100644
--- a/gpu/command_buffer/service/context_state.cc
+++ b/gpu/command_buffer/service/context_state.cc
@@ -312,6 +312,14 @@ void ContextState::RestoreTransformFeedbackBindings(
   }
 }
 
+void ContextState::RestoreIndexedUniformBufferBindings(
+    const ContextState* prev_state) {
+  if (!feature_info_->IsES3Capable())
+    return;
+  indexed_uniform_buffer_bindings->RestoreBindings(
+      prev_state ? prev_state->indexed_uniform_buffer_bindings.get() : nullptr);
+}
+
 void ContextState::RestoreActiveTexture() const {
   glActiveTexture(GL_TEXTURE0 + active_texture_unit);
 }
@@ -446,6 +454,7 @@ void ContextState::RestoreState(const ContextState* prev_state) {
   RestoreRenderbufferBindings();
   RestoreProgramBindings();
   RestoreTransformFeedbackBindings(prev_state);
+  RestoreIndexedUniformBufferBindings(prev_state);
   RestoreGlobalState(prev_state);
 }