Revert of Added a debug info UI for Blimp

cc/trees/remote_channel_unittest.cc

 // Copyright 2016 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 "cc/test/begin_frame_args_test.h"
 #include "cc/test/layer_tree_test.h"
 
 namespace cc {
 
 class RemoteChannelTest : public LayerTreeTest {
@@ skipping 119 matching lines @@
 };
 
 REMOTE_DIRECT_RENDERER_TEST_F(RemoteChannelTestReleaseOutputSurface);
 
 class RemoteChannelTestCommit : public RemoteChannelTest {
   void BeginChannelTest() override {
     layer_tree_host()->SetViewportSize(viewport_size_);
     PostSetNeedsCommitToMainThread();
   }
 
-  void SetNeedsCommitOnImpl() override {
-    calls_received_++;
-    EXPECT_EQ(1, calls_received_);
-  }
+  void SetNeedsCommitOnImpl() override { EXPECT_EQ(0, calls_received_++); }
 
-  void ReceivedBeginMainFrame() override {
-    calls_received_++;
-    EXPECT_EQ(2, calls_received_);
-  }
+  void ReceivedBeginMainFrame() override { EXPECT_EQ(1, calls_received_++); }
 
-  void StartCommitOnImpl() override {
-    calls_received_++;
-    EXPECT_EQ(3, calls_received_);
-  }
+  void StartCommitOnImpl() override { EXPECT_EQ(2, calls_received_++); }
 
-  void DidCommitAndDrawFrame() override {
-    calls_received_on_both_server_and_client_++;
-  }
+  void DidCommitAndDrawFrame() override { EXPECT_EQ(3, calls_received_++); }
 
   void DidCompleteSwapBuffers() override {
-    calls_received_on_both_server_and_client_++;
-    if (calls_received_on_both_server_and_client_ == 4)
+    if (++calls_received_on_both_server_and_client_ == 2)
       EndTest();
   }
 
   void WillCommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     // Ensure that we serialized and deserialized the LayerTreeHost for the
     // commit.
     EXPECT_EQ(viewport_size_, host_impl->device_viewport_size());
   }
 
   void AfterTest() override {
-    EXPECT_EQ(3, calls_received_);
-    EXPECT_EQ(4, calls_received_on_both_server_and_client_);
+    EXPECT_EQ(4, calls_received_);
+    EXPECT_EQ(2, calls_received_on_both_server_and_client_);
   }
 
   const gfx::Size viewport_size_ = gfx::Size(5, 3);
 };
 
 REMOTE_DIRECT_RENDERER_TEST_F(RemoteChannelTestCommit);
 
 class RemoteChannelTestBeginMainFrameAborted : public RemoteChannelTest {
   void BeginChannelTest() override { PostSetNeedsCommitToMainThread(); }
 
@@ skipping 52 matching lines @@
   }
 
   int output_surface_initialized_count_;
   int commit_count_;
 };
 
 REMOTE_DIRECT_RENDERER_TEST_F(
     RemoteChannelTestReleaseOutputSurfaceDuringCommit);
 
 }  // namespace cc