Rename GetRootWindow() -> GetPrimaryRootWindow()

chrome/test/base/view_event_test_base.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 "chrome/test/base/view_event_test_base.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 69 matching lines @@
   // executed before UI events are executed.
   ui_controls::RunClosureAfterAllPendingUIEvents(MessageLoop::QuitClosure());
 }
 
 void ViewEventTestBase::SetUp() {
   ui::CompositorTestSupport::Initialize();
 #if defined(USE_ASH)
   ash::Shell::CreateInstance(NULL);
   // The shell runs with a locked screen in tests, so we must clear the event
   // client so it doesn't interfere with event propagation.
-  aura::client::SetEventClient(ash::Shell::GetInstance()->GetRootWindow(),
+  aura::client::SetEventClient(ash::Shell::GetPrimaryRootWindow(),
                                NULL);
 #endif
   window_ = views::Widget::CreateWindow(this);
 }
 
 void ViewEventTestBase::TearDown() {
   if (window_) {
 #if defined(OS_WIN) && !defined(USE_AURA)
     DestroyWindow(window_->GetNativeWindow());
 #else
@@ skipping 77 matching lines @@
   dnd_thread_.reset(NULL);
 }
 
 void ViewEventTestBase::RunTestMethod(const base::Closure& task) {
   StopBackgroundThread();
 
   task.Run();
   if (HasFatalFailure())
     Done();
 }