Revert of ash: Refactor touch hud drawing to ash/touch_hud.

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 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 "ash/touch/touch_observer_hud.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/touch/touch_hud_projection.h"
-#include "ash/touch_hud/touch_hud_renderer.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 class TouchHudTestBase : public test::AshTestBase {
  public:
@@ skipping 250 matching lines @@
 
   void DisableTouchHudProjection() {
     Shell::GetInstance()->SetTouchHudProjectionEnabled(false);
   }
 
   TouchHudProjection* GetInternalTouchHudProjection() {
     return GetInternalRootController()->touch_hud_projection();
   }
 
   int GetInternalTouchPointsCount() {
-    return GetInternalTouchHudProjection()->touch_hud_renderer_->points_.size();
+    return GetInternalTouchHudProjection()->points_.size();
   }
 
   void SendTouchEventToInternalHud(ui::EventType type,
                                    const gfx::Point& location,
                                    int touch_id) {
     ui::TouchEvent event(type, location, touch_id, event_time);
     GetInternalTouchHudProjection()->OnTouchEvent(&event);
 
     // Advance time for next event.
     event_time += base::TimeDelta::FromMilliseconds(100);
@@ skipping 315 matching lines @@
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 }  // namespace ash