Rename one BlobStorageContextGetter function
In jumbo/unity builds, it conflicts with the function with the same
name that is declared in content/browser/download/download_utils.h.
Change-Id: I6e19c76dca926fbd13ae2c804b92ab454fe2d0dc
Reviewed-on: https://chromium-review.googlesource.com/926343
Reviewed-by: Nick Carter <[email protected]>
Commit-Queue: Jens Widell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#538093}diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index 5b34969..0cf6cde 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -189,7 +189,7 @@
DISALLOW_COPY_AND_ASSIGN(BrowserContextServiceManagerConnectionHolder);
};
-base::WeakPtr<storage::BlobStorageContext> BlobStorageContextGetter(
+base::WeakPtr<storage::BlobStorageContext> BlobStorageContextGetterForBrowser(
scoped_refptr<ChromeBlobStorageContext> blob_context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
return blob_context->context()->AsWeakPtr();
@@ -365,7 +365,8 @@
DCHECK_CURRENTLY_ON(BrowserThread::UI);
scoped_refptr<ChromeBlobStorageContext> chrome_blob_context =
ChromeBlobStorageContext::GetFor(browser_context);
- return base::BindRepeating(&BlobStorageContextGetter, chrome_blob_context);
+ return base::BindRepeating(&BlobStorageContextGetterForBrowser,
+ chrome_blob_context);
}
// static
