test_runner: Move everything else into content namespace.

content/shell/renderer/test_runner/event_sender.cc

 // Copyright 2014 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 "content/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 120 matching lines @@
 // this function does only what LayoutTests are expecting:
 // - Many test checks the count of items. So returning non-zero value makes
 // sense.
 // - Some test compares the count before and after some action. So changing the
 // count based on flags also makes sense. This function is doing such for some
 // flags.
 // - Some test even checks actual string content. So providing it would be also
 // helpful.
 std::vector<std::string> MakeMenuItemStringsFor(
     WebContextMenuData* context_menu,
-    WebTestRunner::WebTestDelegate* delegate) {
+    WebTestDelegate* delegate) {
   // These constants are based on Safari's context menu because tests are made
   // for it.
   static const char* kNonEditableMenuStrings[] = {
     "Back",
     "Reload Page",
     "Open in Dashbaord",
     "<separator>",
     "View Source",
     "Save Page As",
     "Print Page",
@@ skipping 44 matching lines @@
 const float kScrollbarPixelsPerTick = 40.0f;
 
 WebMouseEvent::Button GetButtonTypeFromButtonNumber(int button_code) {
   if (!button_code)
     return WebMouseEvent::ButtonLeft;
   if (button_code == 2)
     return WebMouseEvent::ButtonRight;
   return WebMouseEvent::ButtonMiddle;
 }
 
-class MouseDownTask : public WebTestRunner::WebMethodTask<EventSender> {
+class MouseDownTask : public WebMethodTask<EventSender> {
  public:
   MouseDownTask(EventSender* obj, int button_number, int modifiers)
       : WebMethodTask<EventSender>(obj),
         button_number_(button_number),
         modifiers_(modifiers) {}
 
   virtual void runIfValid() OVERRIDE {
     m_object->MouseDown(button_number_, modifiers_);
   }
 
  private:
   int button_number_;
   int modifiers_;
 };
 
-class MouseUpTask : public WebTestRunner::WebMethodTask<EventSender> {
+class MouseUpTask : public WebMethodTask<EventSender> {
  public:
   MouseUpTask(EventSender* obj, int button_number, int modifiers)
       : WebMethodTask<EventSender>(obj),
         button_number_(button_number),
         modifiers_(modifiers) {}
 
   virtual void runIfValid() OVERRIDE {
     m_object->MouseUp(button_number_, modifiers_);
   }
 
  private:
   int button_number_;
   int modifiers_;
 };
 
-class KeyDownTask : public WebTestRunner::WebMethodTask<EventSender> {
+class KeyDownTask : public WebMethodTask<EventSender> {
  public:
   KeyDownTask(EventSender* obj,
               const std::string code_str,
               int modifiers,
               KeyLocationCode location)
       : WebMethodTask<EventSender>(obj),
         code_str_(code_str),
         modifiers_(modifiers),
         location_(location) {}
 
@@ skipping 751 matching lines @@
 
 WebMouseEvent::Button EventSender::last_button_type_ =
     WebMouseEvent::ButtonNone;
 
 EventSender::SavedEvent::SavedEvent()
     : type(TYPE_UNSPECIFIED),
       button_type(WebMouseEvent::ButtonNone),
       milliseconds(0),
       modifiers(0) {}
 
-EventSender::EventSender(WebTestRunner::TestInterfaces* interfaces)
+EventSender::EventSender(TestInterfaces* interfaces)
     : interfaces_(interfaces),
       delegate_(NULL),
       view_(NULL),
       force_layout_on_events_(false),
       is_drag_mode_(true),
       touch_modifiers_(0),
       touch_cancelable_(true),
       replaying_saved_events_(false),
       current_drag_effects_allowed_(blink::WebDragOperationNone),
       last_click_time_sec_(0),
@@ skipping 51 matching lines @@
 
   touch_modifiers_ = 0;
   touch_cancelable_ = true;
   touch_points_.clear();
 }
 
 void EventSender::Install(WebFrame* frame) {
   EventSenderBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
-void EventSender::SetDelegate(WebTestRunner::WebTestDelegate* delegate) {
+void EventSender::SetDelegate(WebTestDelegate* delegate) {
   delegate_ = delegate;
 }
 
 void EventSender::SetWebView(WebView* view) {
   view_ = view;
 }
 
 void EventSender::SetContextMenuData(const WebContextMenuData& data) {
   last_context_menu_data_.reset(new WebContextMenuData(data));
 }
@@ skipping 302 matching lines @@
     window_list.at(i)->webView()->setZoomLevel(
         window_list.at(i)->webView()->zoomLevel() - 1);
   }
 }
 
 void EventSender::SetPageZoomFactor(double zoom_factor) {
   const std::vector<WebTestProxyBase*>& window_list = interfaces_->windowList();
 
   for (size_t i = 0; i < window_list.size(); ++i) {
     window_list.at(i)->webView()->setZoomLevel(
-        content::ZoomFactorToZoomLevel(zoom_factor));
+        ZoomFactorToZoomLevel(zoom_factor));
   }
 }
 
 void EventSender::SetPageScaleFactor(float scale_factor, int x, int y) {
   view_->setPageScaleFactorLimits(scale_factor, scale_factor);
   view_->setPageScaleFactor(scale_factor, WebPoint(x, y));
 }
 
 void EventSender::ClearTouchPoints() {
   touch_points_.clear();
@@ skipping 755 matching lines @@
       }
       default:
         NOTREACHED();
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 }  // namespace content