summaryrefslogtreecommitdiffstats
path: root/content/browser/indexed_db
diff options
context:
space:
mode:
authornasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 11:53:18 +0000
committernasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 11:53:18 +0000
commit4e3c752307b8a68f8d279aa4612662f8684f5363 (patch)
tree9db812137ad3acc1c6562853fb0838d448aa38e1 /content/browser/indexed_db
parentc0101c75c353ec1d932e1d531617b963714ac17d (diff)
downloadchromium_src-4e3c752307b8a68f8d279aa4612662f8684f5363.zip
chromium_src-4e3c752307b8a68f8d279aa4612662f8684f5363.tar.gz
chromium_src-4e3c752307b8a68f8d279aa4612662f8684f5363.tar.bz2
Content changes for GetURL refactor.
The GetURL method doesn't cover the different use cases for it, so it is being split up and the original will be removed. This CL is converting content code to use the proper version of WebContents::GetURL API. BUG=237908 Review URL: https://chromiumcodereview.appspot.com/21173002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/indexed_db')
-rw-r--r--content/browser/indexed_db/indexed_db_browsertest.cc3
-rw-r--r--content/browser/indexed_db/indexed_db_internals_ui.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc
index ab010cb..ac541e7 100644
--- a/content/browser/indexed_db/indexed_db_browsertest.cc
+++ b/content/browser/indexed_db/indexed_db_browsertest.cc
@@ -46,7 +46,8 @@ class IndexedDBBrowserTest : public ContentBrowserTest {
LOG(INFO) << "Navigating to URL and blocking.";
NavigateToURLBlockUntilNavigationsComplete(the_browser, test_url, 2);
LOG(INFO) << "Navigation done.";
- std::string result = the_browser->web_contents()->GetURL().ref();
+ std::string result =
+ the_browser->web_contents()->GetLastCommittedURL().ref();
if (result != "pass") {
std::string js_result;
ASSERT_TRUE(ExecuteScriptAndExtractString(
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index f6f3bce..230b788 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -278,7 +278,7 @@ void IndexedDBInternalsUI::OnDownloadDataReady(
DownloadUrlParameters::FromWebContents(web_ui()->GetWebContents(), url));
DownloadManager* dlm = BrowserContext::GetDownloadManager(browser_context);
- const GURL referrer(web_ui()->GetWebContents()->GetURL());
+ const GURL referrer(web_ui()->GetWebContents()->GetLastCommittedURL());
dl_params->set_referrer(
content::Referrer(referrer, WebKit::WebReferrerPolicyDefault));