Fix the content_browsertests everywhere maybe.

ui/views/widget/native_widget_aura.cc

Index: ui/views/widget/native_widget_aura.cc
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 508948552145be5bec03606cec3bbfb3dcd34c6e..1888378a3538f3c3f5b8f965a34fe95b172f362b 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -136,15 +136,8 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
   if (parent) {
     parent->AddChild(window_);
   } else {
-    // TODO(erg): Once I've threaded context through chrome, uncomment this
-    // check, which currently fails on the NULL == NULL case.
-    //
-    // DCHECK_NE(params.GetParent(), params.context);

[Elliot Glaysher, 2013/01/14 22:56:39]

This DCHECK_NE is probably incorrect; just up-function, context is set to parent
in some cases.

-
-    // TODO(erg): Remove this NULL check once we've made everything in views
-    // actually pass us a context.
-    aura::RootWindow* root_window = context ? context->GetRootWindow() : NULL;
-    window_->SetDefaultParentByRootWindow(root_window, window_bounds);
+    window_->SetDefaultParentByRootWindow(context->GetRootWindow(),
+                                          window_bounds);
   }
 
   // Wait to set the bounds until we have a parent. That way we can know our