summaryrefslogtreecommitdiffstats
path: root/url/gurl.h
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 21:20:31 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-22 21:20:31 +0000
commite05d81f7b7bd8867baab724ff7ef674817d5b9d9 (patch)
treeff72304e975da1db5f9b1cc622b1e3af1220f391 /url/gurl.h
parent891d9c79bfaf4a9730389a7cd81df0a7d5697bb0 (diff)
downloadchromium_src-e05d81f7b7bd8867baab724ff7ef674817d5b9d9.zip
chromium_src-e05d81f7b7bd8867baab724ff7ef674817d5b9d9.tar.gz
chromium_src-e05d81f7b7bd8867baab724ff7ef674817d5b9d9.tar.bz2
Make GURL use scoped_ptr for inner_url_
BUG=309975 R=brettw@chromium.org, darin@chromium.org Review URL: https://codereview.chromium.org/34843004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/gurl.h')
-rw-r--r--url/gurl.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/url/gurl.h b/url/gurl.h
index 7e71aa9..254f64b 100644
--- a/url/gurl.h
+++ b/url/gurl.h
@@ -8,6 +8,7 @@
#include <iosfwd>
#include <string>
+#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "url/url_canon.h"
#include "url/url_canon_stdstring.h"
@@ -345,7 +346,7 @@ class URL_EXPORT GURL {
// Returns the inner URL of a nested URL [currently only non-null for
// filesystem: URLs].
const GURL* inner_url() const {
- return inner_url_;
+ return inner_url_.get();
}
private:
@@ -370,7 +371,7 @@ class URL_EXPORT GURL {
url_parse::Parsed parsed_;
// Used for nested schemes [currently only filesystem:].
- GURL* inner_url_;
+ scoped_ptr<GURL> inner_url_;
// TODO bug 684583: Add encoding for query params.
};