Merge WebKit at r72274: Initial merge by git.

Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb

2 files changed, 12 insertions, 12 deletions

diff --git a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp b/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp
index daacd6c..8a526c4 100644
--- a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebGeolocationClient.cpp
@@ -25,24 +25,24 @@
 
 #include "config.h"
 #include "WebKitDLL.h"
-#include "WebGeolocationControllerClient.h"
+#include "WebGeolocationClient.h"
 
 #include "WebGeolocationPosition.h"
 #include "WebView.h"
 
 using namespace WebCore;
 
-WebGeolocationControllerClient::WebGeolocationControllerClient(WebView* webView)
+WebGeolocationClient::WebGeolocationClient(WebView* webView)
     : m_webView(webView)
 {
 }
 
-void WebGeolocationControllerClient::geolocationDestroyed()
+void WebGeolocationClient::geolocationDestroyed()
 {
     delete this;
 }
 
-void WebGeolocationControllerClient::startUpdating()
+void WebGeolocationClient::startUpdating()
 {
     COMPtr<IWebGeolocationProvider> provider;
     if (FAILED(m_webView->geolocationProvider(&provider)))
@@ -50,7 +50,7 @@ void WebGeolocationControllerClient::startUpdating()
     provider->registerWebView(m_webView.get());
 }
 
-void WebGeolocationControllerClient::stopUpdating()
+void WebGeolocationClient::stopUpdating()
 {
     COMPtr<IWebGeolocationProvider> provider;
     if (FAILED(m_webView->geolocationProvider(&provider)))
@@ -58,7 +58,7 @@ void WebGeolocationControllerClient::stopUpdating()
     provider->unregisterWebView(m_webView.get());
 }
 
-GeolocationPosition* WebGeolocationControllerClient::lastPosition()
+GeolocationPosition* WebGeolocationClient::lastPosition()
 {
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
     COMPtr<IWebGeolocationProvider> provider;
diff --git a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h b/WebKit/win/WebCoreSupport/WebGeolocationClient.h
index ed73454..2422ae5 100644
--- a/WebKit/win/WebCoreSupport/WebGeolocationControllerClient.h
+++ b/WebKit/win/WebCoreSupport/WebGeolocationClient.h
@@ -23,11 +23,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebGeolocationControllerClient_h
-#define WebGeolocationControllerClient_h
+#ifndef WebGeolocationClient_h
+#define WebGeolocationClient_h
 
 #include "COMPtr.h"
-#include <WebCore/GeolocationControllerClient.h>
+#include <WebCore/GeolocationClient.h>
 
 namespace WebCore {
     class GeolocationPosition;
@@ -35,9 +35,9 @@ namespace WebCore {
 
 class WebView;
 
-class WebGeolocationControllerClient : public WebCore::GeolocationControllerClient {
+class WebGeolocationClient : public WebCore::GeolocationClient {
 public:
-    WebGeolocationControllerClient(WebView*);
+    WebGeolocationClient(WebView*);
 
     virtual void geolocationDestroyed();
     virtual void startUpdating();
@@ -49,4 +49,4 @@ private:
     COMPtr<WebView> m_webView;
 };
 
-#endif // WebGeolocationControllerClient_h
+#endif // WebGeolocationClient_h