Prepare a bunch of ash tests for workspace2. With Workspace2 you can't

ash/wm/activation_controller_unittest.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 "ash/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/compositor/layer.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(CreateWindow)
 #undef CreateWindow
 #endif
 #endif
 
 namespace {
 
 // Containers used for the tests.
-const int c1 = ash::internal::kShellWindowId_DefaultContainer;
+const int kDefaultContainerID = -1;  // Used to identify the default container.
 const int c2 = ash::internal::kShellWindowId_AlwaysOnTopContainer;
 const int c3 = ash::internal::kShellWindowId_LockScreenContainer;
 
 }  // namespace
 
 namespace ash {
 namespace test {
 
 typedef test::AshTestBase ActivationControllerTest;
 
@@ skipping 24 matching lines @@
   aura::Window* w7() { return w7_.get(); }
 
   void DestroyWindow2() {
     w2_.reset();
   }
 
  private:
   void CreateWindows() {
     // Create four windows, the first and third are not activatable, the second
     // and fourth are.
-    w1_.reset(CreateWindow(1, &ad_1_, c1));
-    w2_.reset(CreateWindow(2, &ad_2_, c1));
-    w3_.reset(CreateWindow(3, &ad_3_, c1));
-    w4_.reset(CreateWindow(4, &ad_4_, c1));
+    w1_.reset(CreateWindow(1, &ad_1_, kDefaultContainerID));
+    w2_.reset(CreateWindow(2, &ad_2_, kDefaultContainerID));
+    w3_.reset(CreateWindow(3, &ad_3_, kDefaultContainerID));
+    w4_.reset(CreateWindow(4, &ad_4_, kDefaultContainerID));
     w5_.reset(CreateWindow(5, &ad_5_, c2));
     w6_.reset(CreateWindow(6, &ad_6_, c2));
     w7_.reset(CreateWindow(7, &ad_7_, c3));
   }
 
   aura::Window* CreateWindow(int id,
                              TestActivationDelegate* delegate,
                              int container_id) {
+    aura::Window* parent = container_id == kDefaultContainerID ? NULL :
+        Shell::GetContainer(Shell::GetPrimaryRootWindow(), container_id);
     aura::Window* window = aura::test::CreateTestWindowWithDelegate(
         &delegate_,
         id,
         gfx::Rect(),
-        Shell::GetContainer(Shell::GetPrimaryRootWindow(), container_id));
+        parent);
     delegate->SetWindow(window);
     return window;
   }
 
   void DestroyWindows() {
     w1_.reset();
     w2_.reset();
     w3_.reset();
     w4_.reset();
     w5_.reset();
@@ skipping 358 matching lines @@
   scoped_ptr<aura::Window> w1(aura::test::CreateTestWindowWithDelegate(
     &wd, -1, gfx::Rect(50, 50, 50, 50), NULL));
 
   EXPECT_TRUE(wm::CanActivateWindow(w1.get()));
   w1->layer()->SetVisible(false);
   EXPECT_TRUE(wm::CanActivateWindow(w1.get()));
 }
 
 }  // namespace test
 }  // namespace ash