Rename navigator.serviceWorker.current to controller.

Source/modules/serviceworkers/ServiceWorkerContainer.h

Index: Source/modules/serviceworkers/ServiceWorkerContainer.h
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.h b/Source/modules/serviceworkers/ServiceWorkerContainer.h
index 19612b22f6e71420a36504c0e4c0aca73ec3a04f..3863f17a5e1dfabb99424e18074ca380293c9e36 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainer.h
+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.h
@@ -67,17 +67,20 @@ public:
     ScriptPromise registerServiceWorker(ExecutionContext*, const String& pattern, const Dictionary&);
     ScriptPromise unregisterServiceWorker(ExecutionContext*, const String& scope = String());
 
-    PassRefPtr<ServiceWorker> current() { return m_current; }
+    PassRefPtr<ServiceWorker> controller() { return m_controller; }
 
     // WebServiceWorkerProviderClient overrides.
-    virtual void setCurrentServiceWorker(blink::WebServiceWorker*) OVERRIDE;
+    virtual void setController(blink::WebServiceWorker*) OVERRIDE;
     virtual void dispatchMessageEvent(const blink::WebString& message, const blink::WebMessagePortChannelArray&) OVERRIDE;
 
+    // FIXME: Delete this when the embedder switches to setController.
+    virtual void setCurrentServiceWorker(blink::WebServiceWorker*) OVERRIDE;
+
 private:
     explicit ServiceWorkerContainer(ExecutionContext*);
 
     blink::WebServiceWorkerProvider* m_provider;
-    RefPtr<ServiceWorker> m_current;
+    RefPtr<ServiceWorker> m_controller;
 };
 
 } // namespace WebCore