Rename navigator.serviceWorker.current to controller.

Source/modules/serviceworkers/ServiceWorkerContainer.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 49 matching lines @@
     public blink::WebServiceWorkerProviderClient {
 public:
     static PassRefPtr<ServiceWorkerContainer> create(ExecutionContext*);
     ~ServiceWorkerContainer();
 
     void detachClient();
 
     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 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;
-    virtual void dispatchMessageEvent(const blink::WebString& message, const blink::WebMessagePortChannelArray&) OVERRIDE;
 
 private:
     explicit ServiceWorkerContainer(ExecutionContext*);
 
     blink::WebServiceWorkerProvider* m_provider;
-    RefPtr<ServiceWorker> m_current;
+    RefPtr<ServiceWorker> m_controller;
 };
 
 } // namespace WebCore
 
 #endif // ServiceWorkerContainer_h