Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure

content/browser/web_contents/web_contents_view_aura.cc

Index: content/browser/web_contents/web_contents_view_aura.cc
===================================================================
--- content/browser/web_contents/web_contents_view_aura.cc	(revision 177189)
+++ content/browser/web_contents/web_contents_view_aura.cc	(working copy)
@@ -634,18 +634,10 @@
   window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
   window_->SetTransparent(false);
   window_->Init(ui::LAYER_NOT_DRAWN);
-  if (context) {
-    // There are places where there is no context currently because object
-    // hierarchies are built before they're attached to a Widget. (See
-    // views::WebView as an example; GetWidget() returns NULL at the point
-    // where we are created.)
-    //
-    // It should be OK to not set a default parent since such users will
-    // explicitly add this WebContentsViewAura to their tree after they create
-    // us.
-    window_->SetDefaultParentByRootWindow(context->GetRootWindow(),
-                                          gfx::Rect());
-  }
+  // TODO(mukai, erg): Should use a non-NULL value later when the DCHECK is
+  // turned on in SetDefaultParentByRootWindow().
+  aura::RootWindow* target_root = context ? context->GetRootWindow() : NULL;
+  window_->SetDefaultParentByRootWindow(target_root, gfx::Rect());
   window_->layer()->SetMasksToBounds(true);
   window_->SetName("WebContentsViewAura");
 
Property changes on: content/browser/web_contents/web_contents_view_aura.cc
___________________________________________________________________
Deleted: svn:mergeinfo