Revert of Window prerequisites for ShelfWindowWatcher panel support.

components/exo/shell_surface_unittest.cc

Index: components/exo/shell_surface_unittest.cc
diff --git a/components/exo/shell_surface_unittest.cc b/components/exo/shell_surface_unittest.cc
index 0a73554f549ae8ec8b197f1064b6ad3ca1510e4d..1ba2412c316d2ad9e7bef8fa30d56b30f17d7262 100644
--- a/components/exo/shell_surface_unittest.cc
+++ b/components/exo/shell_surface_unittest.cc
@@ -204,10 +204,11 @@
   std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
 
   surface->Commit();
-  aura::Window* window = shell_surface->GetWidget()->GetNativeWindow();
-  EXPECT_EQ("", ShellSurface::GetApplicationId(window));
+  EXPECT_EQ("", ShellSurface::GetApplicationId(
+                    shell_surface->GetWidget()->GetNativeWindow()));
   shell_surface->SetApplicationId("test");
-  EXPECT_EQ("test", ShellSurface::GetApplicationId(window));
+  EXPECT_EQ("test", ShellSurface::GetApplicationId(
+                        shell_surface->GetWidget()->GetNativeWindow()));
 }
 
 TEST_F(ShellSurfaceTest, Move) {