From 9ee9a76a1e9bf4ea2088bbb2986f3cf9b0718a97 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Wed, 28 Oct 2009 21:02:59 +0000 Subject: 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 --- webkit/glue/media/buffered_data_source.h | 2 +- webkit/glue/media/buffered_data_source_unittest.cc | 2 +- webkit/glue/media/simple_data_source.cc | 4 ++-- webkit/glue/media/simple_data_source.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'webkit/glue/media') 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< -- cgit v1.1