diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 21:02:59 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-28 21:02:59 +0000 |
commit | 9ee9a76a1e9bf4ea2088bbb2986f3cf9b0718a97 (patch) | |
tree | 518de8dde8dfdce71db94ff79f81add215b84582 /webkit/glue | |
parent | c8619f55658bfdbac62ce4d4d391b20f6935a8d5 (diff) | |
download | chromium_src-9ee9a76a1e9bf4ea2088bbb2986f3cf9b0718a97.zip chromium_src-9ee9a76a1e9bf4ea2088bbb2986f3cf9b0718a97.tar.gz chromium_src-9ee9a76a1e9bf4ea2088bbb2986f3cf9b0718a97.tar.bz2 |
Make GetURLForDebugging return a const GURL.
Review URL: http://codereview.chromium.org/326003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/media/buffered_data_source.h | 2 | ||||
-rw-r--r-- | webkit/glue/media/buffered_data_source_unittest.cc | 2 | ||||
-rw-r--r-- | webkit/glue/media/simple_data_source.cc | 4 | ||||
-rw-r--r-- | webkit/glue/media/simple_data_source.h | 2 | ||||
-rw-r--r-- | webkit/glue/resource_loader_bridge.h | 2 | ||||
-rw-r--r-- | webkit/glue/weburlloader_impl.cc | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/webkit/glue/media/buffered_data_source.h b/webkit/glue/media/buffered_data_source.h index 59c511b..6a68048 100644 --- a/webkit/glue/media/buffered_data_source.h +++ b/webkit/glue/media/buffered_data_source.h @@ -117,7 +117,7 @@ class BufferedResourceLoader : virtual void OnReceivedData(const char* data, int len); virtual void OnCompletedRequest(const URLRequestStatus& status, const std::string& security_info); - std::string GetURLForDebugging() { return url_.spec(); } + GURL GetURLForDebugging() const { return url_; } protected: // An empty constructor so mock classes can be constructed. diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc index 0b5099d..d22bcbc 100644 --- a/webkit/glue/media/buffered_data_source_unittest.cc +++ b/webkit/glue/media/buffered_data_source_unittest.cc @@ -74,7 +74,7 @@ class BufferedResourceLoaderTest : public testing::Test { loader_ = new BufferedResourceLoader(&bridge_factory_, gurl_, first_position_, last_position_); - EXPECT_EQ(gurl_.spec(), loader_->GetURLForDebugging()); + EXPECT_EQ(gurl_.spec(), loader_->GetURLForDebugging().spec()); } void Start() { diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc index ab6cfea..0a4c11e 100644 --- a/webkit/glue/media/simple_data_source.cc +++ b/webkit/glue/media/simple_data_source.cc @@ -161,8 +161,8 @@ void SimpleDataSource::OnCompletedRequest(const URLRequestStatus& status, DoneInitialization_Locked(status.is_success()); } -std::string SimpleDataSource::GetURLForDebugging() { - return url_.spec(); +GURL SimpleDataSource::GetURLForDebugging() const { + return url_; } void SimpleDataSource::SetURL(const GURL& url) { diff --git a/webkit/glue/media/simple_data_source.h b/webkit/glue/media/simple_data_source.h index faf889d..c578aa5 100644 --- a/webkit/glue/media/simple_data_source.h +++ b/webkit/glue/media/simple_data_source.h @@ -62,7 +62,7 @@ class SimpleDataSource : public media::DataSource, virtual void OnReceivedData(const char* data, int len); virtual void OnCompletedRequest(const URLRequestStatus& status, const std::string& security_info); - virtual std::string GetURLForDebugging(); + virtual GURL GetURLForDebugging() const; private: friend class media::FilterFactoryImpl2< diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index 302a1be..8393a9f 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -132,7 +132,7 @@ class ResourceLoaderBridge { // Returns the URL of the request, which allows us to display it in // debugging situations. - virtual std::string GetURLForDebugging() = 0; + 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 510be0e..cc30f42 100644 --- a/webkit/glue/weburlloader_impl.cc +++ b/webkit/glue/weburlloader_impl.cc @@ -219,7 +219,7 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>, virtual void OnReceivedData(const char* data, int len); virtual void OnCompletedRequest( const URLRequestStatus& status, const std::string& security_info); - virtual std::string GetURLForDebugging(); + virtual GURL GetURLForDebugging() const; private: friend class base::RefCounted<Context>; @@ -522,8 +522,8 @@ void WebURLLoaderImpl::Context::OnCompletedRequest( Release(); } -std::string WebURLLoaderImpl::Context::GetURLForDebugging() { - return request_.url().spec(); +GURL WebURLLoaderImpl::Context::GetURLForDebugging() const { + return request_.url(); } void WebURLLoaderImpl::Context::HandleDataURL() { |