Update from https://crrev.com/315085

gpu/command_buffer/client/query_tracker_unittest.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.
 
 // Tests for the QueryTracker.
 
 #include "gpu/command_buffer/client/query_tracker.h"
 
 #include <GLES2/gl2ext.h>
 #include "base/memory/scoped_ptr.h"
@@ skipping 143 matching lines @@
   EXPECT_EQ(0, query->token());
   EXPECT_EQ(1, query->submit_count());
 
   // Check MarkAsPending.
   query->MarkAsPending(kToken);
   EXPECT_FALSE(query->NeverUsed());
   EXPECT_TRUE(query->Pending());
   EXPECT_EQ(kToken, query->token());
   EXPECT_EQ(1, query->submit_count());
 
+  // Flush only once if no more flushes happened between a call to
+  // EndQuery command and CheckResultsAvailable
+  // Advance put_ so flush calls in CheckResultsAvailable go through
+  // and updates flush_generation count
+  helper_->Noop(1);
+
+  // Store FlushGeneration count after EndQuery is called
+  uint32 gen1 = GetFlushGeneration();
+
   // Check CheckResultsAvailable.
   EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
   EXPECT_FALSE(query->NeverUsed());
   EXPECT_TRUE(query->Pending());
 
-  // Flush only once if no more flushes happened between a call to
-  // EndQuery command and CheckResultsAvailable
-  // Advance put_ so flush calls in CheckResultsAvailable go through
-  // and updates flush_generation count
-  helper_->Noop(1);
-  // Set Query in pending state_ to simulate EndQuery command is called
-  query->MarkAsPending(kToken);
-  EXPECT_TRUE(query->Pending());
-  // Store FlushGeneration count after EndQuery is called
-  uint32 gen1 = GetFlushGeneration();
-  EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
   uint32 gen2 = GetFlushGeneration();
   EXPECT_NE(gen1, gen2);
+
   // Repeated calls to CheckResultsAvailable should not flush unnecessarily
   EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
   gen1 = GetFlushGeneration();
   EXPECT_EQ(gen1, gen2);
   EXPECT_FALSE(query->CheckResultsAvailable(helper_.get()));
   gen1 = GetFlushGeneration();
   EXPECT_EQ(gen1, gen2);
 
   // Simulate GPU process marking it as available.
   QuerySync* sync = GetSync(query);
@@ skipping 37 matching lines @@
 
   // Check FreeCompletedQueries.
   query_tracker_->FreeCompletedQueries();
   EXPECT_EQ(0u, bucket->used_query_count);
 }
 
 }  // namespace gles2
 }  // namespace gpu