More work to make ash_unittests pass when we require context.

ash/launcher/launcher_view_unittest.cc

Index: ash/launcher/launcher_view_unittest.cc
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index 2c5ade8404c8f44ab2be4d83b3129ce2b75bc53c..d03b63903fa3877b9a6eded1e6b0eb24a2996418 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -14,6 +14,7 @@
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
@@ -21,6 +22,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
@@ -109,6 +111,7 @@ TEST_F(LauncherViewIconObserverTest, AddRemove) {
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(0, 0, 200, 200);
+  params.context = CurrentContext();
 
   scoped_ptr<views::Widget> widget(new views::Widget());
   widget->Init(params);
@@ -200,6 +203,20 @@ class LauncherViewTest : public AshTestBase {
   }
 
  protected:
+  void EnsureViewIsInWidget() {
+    widget_.reset(new views::Widget);
+    views::Widget::InitParams params(
+        views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+    params.transparent = true;
+    params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+    params.parent = Shell::GetContainer(
+        Shell::GetPrimaryRootWindow(),
+        ash::internal::kShellWindowId_LauncherContainer);
+
+    widget_->Init(params);
+    widget_->SetContentsView(launcher_view_.get());
+  }
+
   LauncherID AddAppShortcut() {
     LauncherItem item;
     item.type = TYPE_APP_SHORTCUT;
@@ -341,6 +358,7 @@ class LauncherViewTest : public AshTestBase {
 
   MockLauncherDelegate delegate_;
   scoped_ptr<LauncherModel> model_;
+  scoped_ptr<views::Widget> widget_;
   scoped_ptr<internal::LauncherView> launcher_view_;
   scoped_ptr<LauncherViewTestAPI> test_api_;
 
@@ -682,6 +700,8 @@ TEST_F(LauncherViewTest, LauncherItemStatusPlatformApp) {
 }
 
 TEST_F(LauncherViewTest, LauncherTooltipTest) {
+  EnsureViewIsInWidget();
+
   ASSERT_EQ(test_api_->GetLastVisibleIndex() + 1,
             test_api_->GetButtonCount());