2 files changed, 3 insertions, 10 deletions
diff --git a/Source/WebCore/workers/WorkerLocation.cpp b/Source/WebCore/workers/WorkerLocation.cpp
index 33aebbb..319a528 100644
--- a/Source/WebCore/workers/WorkerLocation.cpp
+++ b/Source/WebCore/workers/WorkerLocation.cpp
@@ -36,8 +36,7 @@ namespace WebCore {
 
 String WorkerLocation::href() const
 {
-    // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225
-    return m_url.hasPath() ? m_url.deprecatedString() : m_url.deprecatedString() + "/";
+    return m_url.string();
 }
 
 String WorkerLocation::protocol() const
@@ -75,12 +74,6 @@ String WorkerLocation::hash() const
     return m_url.fragmentIdentifier().isEmpty() ? "" : "#" + m_url.fragmentIdentifier();
 }
 
-String WorkerLocation::toString() const
-{
-    // FIXME: Stop using deprecatedString(): https://bugs.webkit.org/show_bug.cgi?id=30225
-    return m_url.hasPath() ? m_url.deprecatedString() : m_url.deprecatedString() + "/";
-}
-
 
 } // namespace WebCore
 
diff --git a/Source/WebCore/workers/WorkerLocation.h b/Source/WebCore/workers/WorkerLocation.h
index 5200e35..692c0e3 100644
--- a/Source/WebCore/workers/WorkerLocation.h
+++ b/Source/WebCore/workers/WorkerLocation.h
@@ -30,10 +30,10 @@
 #if ENABLE(WORKERS)
 
 #include "KURL.h"
-#include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
@@ -57,7 +57,7 @@ namespace WebCore {
         String search() const;
         String hash() const;
 
-        String toString() const;
+        String toString() const { return href(); }
 
     private:
         WorkerLocation(const KURL& url) : m_url(url) { }