Revert r274404 and r274409:

content/browser/web_contents/web_contents_view_aura_browsertest.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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
@@ skipping 13 matching lines @@
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
-#include "ui/compositor/test/draw_waiter_for_test.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 
 namespace content {
 
 // This class keeps track of the RenderViewHost whose screenshot was captured.
 class ScreenshotTracker : public NavigationEntryScreenshotManager {
  public:
   explicit ScreenshotTracker(NavigationControllerImpl* controller)
       : NavigationEntryScreenshotManager(controller),
@@ skipping 211 matching lines @@
     return index;
   }
 
  protected:
   ScreenshotTracker* screenshot_manager() { return screenshot_manager_; }
   void set_min_screenshot_interval(int interval_ms) {
     screenshot_manager_->SetScreenshotInterval(interval_ms);
   }
 
  private:
-  // BrowserTestBase:
-  virtual void TearDownOnMainThread() OVERRIDE {
-    aura::Window* window = shell()->web_contents()->GetNativeView();
-    ui::Compositor* compositor = window->layer()->GetCompositor();
-    while (compositor->layer_animator_collection()->HasActiveAnimators())
-      ui::DrawWaiterForTest::Wait(compositor);
-    ContentBrowserTest::TearDownOnMainThread();
-  }
-
   ScreenshotTracker* screenshot_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsViewAuraTest);
 };
 
 // Flaky on Windows and ChromeOS: http://crbug.com/305722
 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
     DISABLED_OverscrollNavigation) {
   TestOverscrollNavigation(false);
 }
@@ skipping 405 matching lines @@
       static_cast<WebContentsImpl*>(shell()->web_contents());
   aura::Window* content = web_contents->GetNativeView()->parent();
   EXPECT_TRUE(web_contents->should_normally_be_visible());
   content->Hide();
   EXPECT_FALSE(web_contents->should_normally_be_visible());
   content->Show();
   EXPECT_TRUE(web_contents->should_normally_be_visible());
 }
 
 }  // namespace content