Attempt to re-land FocusManager removal from Aura.

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 537 matching lines @@
   // increased screenshot interval.
   NavigationController::LoadURLParams params(navigations[0].url);
   params.transition_type = PageTransitionFromInt(navigations[0].transition);
   web_contents->GetController().LoadURLWithParams(params);
   WaitForLoadStop(web_contents);
   screenshot_manager()->WaitUntilScreenshotIsReady();
 
   EXPECT_EQ(NULL, screenshot_manager()->screenshot_taken_for());
 }
 
-// Failing on win7_aura trybot (see crbug.com/260983).
-#if defined(OS_WIN)
-#define MAYBE_ContentWindowReparent \
-        DISABLED_ContentWindowReparent
-#else
-#define MAYBE_ContentWindowReparent ContentWindowReparent
-#endif
+// TODO(sadrul): This test is disabled because it reparents in a way the
+//               FocusController does not support. This code would crash in
+//               a production build. It only passed prior to this revision
+//               because testing used the old FocusManager which did some
+//               different (osbolete) processing. TODO(sadrul) to figure out
+//               how this test should work that mimics production code a bit
+//               better.
 IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
-                       MAYBE_ContentWindowReparent) {
+                       DISABLED_ContentWindowReparent) {
   ASSERT_NO_FATAL_FAILURE(
       StartTestWithPage("files/overscroll_navigation.html"));
 
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->Init(ui::LAYER_NOT_DRAWN);
 
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   ExecuteSyncJSFunction(web_contents->GetRenderViewHost(), "navigate_next()");
   EXPECT_EQ(1, GetCurrentIndex());
@@ skipping 85 matching lines @@
       10);
   string16 actual_title = title_watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, actual_title);
 
   EXPECT_EQ(2, GetCurrentIndex());
   EXPECT_TRUE(controller.CanGoBack());
   EXPECT_FALSE(controller.CanGoForward());
 }
 
 }  // namespace content