Implements part of Device Motion in the Renderer

content/browser/device_orientation/orientation_message_filter.cc

Index: content/browser/device_orientation/orientation_message_filter.cc
diff --git a/content/browser/device_orientation/orientation_message_filter.cc b/content/browser/device_orientation/orientation_message_filter.cc
index 254f48c92ff200a408f7085b97de0c4e5237e8a5..e5eecf3dec90307a3d4bb3c62f08d9d99018c1e6 100644
--- a/content/browser/device_orientation/orientation_message_filter.cc
+++ b/content/browser/device_orientation/orientation_message_filter.cc
@@ -21,44 +21,45 @@ OrientationMessageFilter::OrientationMessageFilter() : provider_(NULL) {
 OrientationMessageFilter::~OrientationMessageFilter() {
 }
 
-class OrientationMessageFilter::ObserverDelegate
-    : public base::RefCounted<ObserverDelegate>, public Provider::Observer {
+class OrientationMessageFilter::OrientationObserverDelegate
+    : public base::RefCounted<OrientationObserverDelegate>,
+      public Provider::OrientationObserver {
  public:
-    // Create ObserverDelegate that observes provider and forwards updates to
-    // render_view_id in process_id.
-    // Will stop observing provider when destructed.
-    ObserverDelegate(Provider* provider,
-                     int render_view_id,
-                     IPC::Sender* sender);
+  // Create OrientationObserverDelegate that observes provider and forwards
+  // updates to render_view_id in process_id.
+  // Will stop observing provider when destructed.
+  OrientationObserverDelegate(Provider* provider, int render_view_id,
+      IPC::Sender* sender);
 
-    // From Provider::Observer.
-    virtual void OnOrientationUpdate(const Orientation& orientation);
+  // From Provider::OrientationObserver.
+  virtual void OnOrientationUpdate(const Orientation& orientation);
 
  private:
-  friend class base::RefCounted<ObserverDelegate>;
-  virtual ~ObserverDelegate();
+  friend class base::RefCounted<OrientationObserverDelegate>;
+  virtual ~OrientationObserverDelegate();
 
   scoped_refptr<Provider> provider_;
   int render_view_id_;
   IPC::Sender* sender_;  // Weak pointer.
 
-  DISALLOW_COPY_AND_ASSIGN(ObserverDelegate);
+  DISALLOW_COPY_AND_ASSIGN(OrientationObserverDelegate);
 };
 
-OrientationMessageFilter::ObserverDelegate::ObserverDelegate(Provider* provider,
-                                                  int render_view_id,
-                                                  IPC::Sender* sender)
+OrientationMessageFilter::OrientationObserverDelegate::
+OrientationObserverDelegate(Provider* provider, int render_view_id,
+                                IPC::Sender* sender)
     : provider_(provider),
       render_view_id_(render_view_id),
       sender_(sender) {
-  provider_->AddObserver(this);
+  provider_->AddOrientationObserver(this);
 }
 
-OrientationMessageFilter::ObserverDelegate::~ObserverDelegate() {
-  provider_->RemoveObserver(this);
+OrientationMessageFilter::OrientationObserverDelegate::
+    ~OrientationObserverDelegate() {
+  provider_->RemoveOrientationObserver(this);
 }
 
-void OrientationMessageFilter::ObserverDelegate::OnOrientationUpdate(
+void OrientationMessageFilter::OrientationObserverDelegate::OnOrientationUpdate(
     const Orientation& orientation) {
   DeviceOrientationMsg_Updated_Params params;
   params.can_provide_alpha = orientation.can_provide_alpha_;
@@ -74,7 +75,7 @@ void OrientationMessageFilter::ObserverDelegate::OnOrientationUpdate(
 }
 
 bool OrientationMessageFilter::OnMessageReceived(const IPC::Message& message,
-                                      bool* message_was_ok) {
+                                                 bool* message_was_ok) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(OrientationMessageFilter, message, *message_was_ok)
@@ -91,9 +92,8 @@ void OrientationMessageFilter::OnStartUpdating(int render_view_id) {
   if (!provider_)
     provider_ = Provider::GetInstance();
 
-  observers_map_[render_view_id] = new ObserverDelegate(provider_,
-                                                        render_view_id,
-                                                        this);
+  observers_map_[render_view_id] = new OrientationObserverDelegate(provider_,
+      render_view_id, this);
 }
 
 void OrientationMessageFilter::OnStopUpdating(int render_view_id) {