Add RootWindowController

ash/wm/screen_dimmer_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/screen_dimmer.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/root_window.h"
 #include "ui/compositor/layer.h"
 
 namespace ash {
 namespace test {
 
 class ScreenDimmerTest : public AshTestBase {
  public:
   ScreenDimmerTest() : dimmer_(NULL) {}
   virtual ~ScreenDimmerTest() {}
 
   void SetUp() OVERRIDE {
     AshTestBase::SetUp();
-    dimmer_ = Shell::GetInstance()->screen_dimmer();
+    dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer();
     test_api_.reset(new internal::ScreenDimmer::TestApi(dimmer_));
   }
 
  protected:
   internal::ScreenDimmer* dimmer_;  // not owned
 
   scoped_ptr<internal::ScreenDimmer::TestApi> test_api_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenDimmerTest);
@@ skipping 34 matching lines @@
 
   // When we resize the root window, the dimming layer should be resized to
   // match.
   gfx::Size kNewSize(400, 300);
   Shell::GetPrimaryRootWindow()->SetHostSize(kNewSize);
   EXPECT_EQ(kNewSize.ToString(), dimming_layer->bounds().size().ToString());
 }
 
 }  // namespace test
 }  // namespace ash