6 files changed, 4 insertions, 22 deletions
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h
index d6a7e24..dfb78d5 100644
--- a/webkit/glue/media/buffered_data_source.h
+++ b/webkit/glue/media/buffered_data_source.h
@@ -123,7 +123,6 @@ class BufferedResourceLoader :
       const URLRequestStatus& status,
       const std::string& security_info,
       const base::Time& completion_time);
-  GURL GetURLForDebugging() const { return url_; }
 
  protected:
   friend class base::RefCountedThreadSafe<BufferedResourceLoader>;
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index 7e6fd54..0e8d4f2 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -79,7 +79,6 @@ class BufferedResourceLoaderTest : public testing::Test {
 
     loader_ = new BufferedResourceLoader(&bridge_factory_, gurl_,
                                          first_position_, last_position_);
-    EXPECT_EQ(gurl_.spec(), loader_->GetURLForDebugging().spec());
   }
 
   void SetLoaderBuffer(size_t forward_capacity, size_t backward_capacity) {
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc
index 256c910..d5a4c3b 100644
--- a/webkit/glue/media/simple_data_source.cc
+++ b/webkit/glue/media/simple_data_source.cc
@@ -134,9 +134,8 @@ void SimpleDataSource::OnCompletedRequest(const URLRequestStatus& status,
   AutoLock auto_lock(lock_);
   // It's possible this gets called after Stop(), in which case |host_| is no
   // longer valid.
-  if (state_ == STOPPED) {
+  if (state_ == STOPPED)
     return;
-  }
 
   // Otherwise we should be initializing and have created a bridge.
   DCHECK_EQ(state_, INITIALIZING);
@@ -145,18 +144,13 @@ void SimpleDataSource::OnCompletedRequest(const URLRequestStatus& status,
 
   // If we don't get a content length or the request has failed, report it
   // as a network error.
-  DCHECK(size_ == -1 || static_cast<size_t>(size_) == data_.length());
-  if (size_ == -1) {
+  if (size_ == -1)
     size_ = data_.length();
-  }
+  DCHECK(static_cast<size_t>(size_) == data_.length());
 
   DoneInitialization_Locked(status.is_success());
 }
 
-GURL SimpleDataSource::GetURLForDebugging() const {
-  return url_;
-}
-
 void SimpleDataSource::SetURL(const GURL& url) {
   url_ = url;
   media_format_.Clear();
diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h
index 2ff851e..f264b8c 100644
--- a/webkit/glue/media/simple_data_source.h
+++ b/webkit/glue/media/simple_data_source.h
@@ -55,7 +55,6 @@ class SimpleDataSource : public media::DataSource,
   virtual void OnCompletedRequest(const URLRequestStatus& status,
                                   const std::string& security_info,
                                   const base::Time& completion_time);
-  virtual GURL GetURLForDebugging() const;
 
  private:
   // Updates |url_| and |media_format_| with the given URL.
diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h
index 2634383..52447b4 100644
--- a/webkit/glue/resource_loader_bridge.h
+++ b/webkit/glue/resource_loader_bridge.h
@@ -306,10 +306,6 @@ class ResourceLoaderBridge {
     virtual void OnCompletedRequest(const URLRequestStatus& status,
                                     const std::string& security_info,
                                     const base::Time& completion_time) = 0;
-
-    // Returns the URL of the request, which allows us to display it in
-    // debugging situations.
-    virtual GURL GetURLForDebugging() const = 0;
   };
 
   // use Create() for construction, but anybody can delete at any time,
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index 374f1323..77fe2a8 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -293,7 +293,6 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
       const URLRequestStatus& status,
       const std::string& security_info,
       const base::Time& completion_time);
-  virtual GURL GetURLForDebugging() const;
 
  private:
   friend class base::RefCounted<Context>;
@@ -658,10 +657,6 @@ void WebURLLoaderImpl::Context::OnCompletedRequest(
   Release();
 }
 
-GURL WebURLLoaderImpl::Context::GetURLForDebugging() const {
-  return request_.url();
-}
-
 void WebURLLoaderImpl::Context::HandleDataURL() {
   ResourceResponseInfo info;
   URLRequestStatus status;