More work to make ash_unittests pass when we require context.

ui/oak/oak_window.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 "ui/oak/oak_window.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 128 matching lines @@
   details_->set_owned_by_client();
   details_container_ = details_->CreateParentIfNecessary();
   details_->SetModel(details_model_.get());
   AddChildView(details_container_);
 
   OnTreeViewSelectionChanged(tree_.get());
 }
 
 }  // namespace internal
 
-void ShowOakWindow() {
+void ShowOakWindowWithContext(gfx::NativeView context) {
   if (!internal::OakWindow::instance) {
+    // TODO(erg): Do we want to reuse this window in times with a different
+    // context? For now, this is OK, but if we ever use Oak outside of the ash
+    // shell, we run into crbug.com/165759.
     internal::OakWindow::instance =
-        views::Widget::CreateWindowWithBounds(new internal::OakWindow,
-                                              gfx::Rect(10, 10, 500, 500));
+        views::Widget::CreateWindowWithContextAndBounds(
+            new internal::OakWindow, context, gfx::Rect(10, 10, 500, 500));
   }
   internal::OakWindow::instance->Show();
 }
 
 }  // namespace oak