Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again.

ui/aura/root_window_host_x11_unittest.cc

 // Copyright 2013 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 "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host_x11.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 44 matching lines @@
   virtual void OnHostMoved(const gfx::Point& origin) OVERRIDE {}
   virtual void OnHostResized(const gfx::Size& size) OVERRIDE {}
 
   virtual float GetDeviceScaleFactor() OVERRIDE {
     return 1.0f;
   }
 
   virtual aura::RootWindow* AsRootWindow() OVERRIDE {
     return NULL;
   }
+  virtual const aura::RootWindow* AsRootWindow() const OVERRIDE {
+    return NULL;
+  }
 
   ui::EventType last_touch_type() {
     return last_touch_type_;
   }
 
   int last_touch_id() {
     return last_touch_id_;
   }
 
   gfx::Point last_touch_location() {
@@ skipping 21 matching lines @@
 #if defined(OS_CHROMEOS)
   // Fake a ChromeOS running env.
   const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 #endif  // defined(OS_CHROMEOS)
 
   scoped_ptr<RootWindowHostX11> root_window_host(
       new RootWindowHostX11(gfx::Rect(0, 0, 2560, 1700)));
   scoped_ptr<TestRootWindowHostDelegate> delegate(
       new TestRootWindowHostDelegate());
-  root_window_host->SetDelegate(delegate.get());
+  root_window_host->set_delegate(delegate.get());
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetupTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, delegate->last_touch_type());
   EXPECT_EQ(-1, delegate->last_touch_id());
 
 #if defined(OS_CHROMEOS)
@@ skipping 43 matching lines @@
 #if defined(OS_CHROMEOS)
 TEST_F(RootWindowHostX11Test, DispatchTouchEventToTwoRootWindow) {
   // Fake a ChromeOS running env.
   const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 
   scoped_ptr<RootWindowHostX11> root_window_host1(
       new RootWindowHostX11(gfx::Rect(0, 0, 2560, 1700)));
   scoped_ptr<TestRootWindowHostDelegate> delegate1(
       new TestRootWindowHostDelegate());
-  root_window_host1->SetDelegate(delegate1.get());
+  root_window_host1->set_delegate(delegate1.get());
 
   int host2_y_offset = 1700;
   scoped_ptr<RootWindowHostX11> root_window_host2(
       new RootWindowHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080)));
   scoped_ptr<TestRootWindowHostDelegate> delegate2(
       new TestRootWindowHostDelegate());
-  root_window_host2->SetDelegate(delegate2.get());
+  root_window_host2->set_delegate(delegate2.get());
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetupTouchDevicesForTest(devices);
   std::vector<ui::Valuator> valuators;
 
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(ui::ET_UNKNOWN, delegate2->last_touch_type());
   EXPECT_EQ(-1, delegate2->last_touch_id());
@@ skipping 73 matching lines @@
 
   // Revert the CrOS testing env otherwise the following non-CrOS aura
   // tests will fail.
   // Fake a ChromeOS running env.
   kLsbRelease = "";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace aura