| Index: components/keyed_service/ios/browser_state_helper.cc
|
| diff --git a/components/keyed_service/ios/browser_state_helper.cc b/components/keyed_service/ios/browser_state_helper.cc
|
| index 50624449dd651d29ed5254f2262a62936de6b347..c8e39f8e2257163deeae4b43e5eb1b910fbdf05c 100644
|
| --- a/components/keyed_service/ios/browser_state_helper.cc
|
| +++ b/components/keyed_service/ios/browser_state_helper.cc
|
| @@ -31,19 +31,19 @@
|
| // to find the associated web::BrowserState (there is a 1:1 mapping).
|
|
|
| namespace {
|
| -BrowserStateFromContextFn gBrowserStateFromContext = nullptr;
|
| +BrowserStateFromContextFn g_browser_state_from_context = nullptr;
|
| } // namespace
|
|
|
| void SetBrowserStateFromContextHelper(BrowserStateFromContextFn helper) {
|
| - gBrowserStateFromContext = helper;
|
| + g_browser_state_from_context = helper;
|
| }
|
|
|
| web::BrowserState* BrowserStateFromContext(base::SupportsUserData* context) {
|
| web::BrowserState* state = nullptr;
|
| if (context) {
|
| state = web::BrowserState::FromSupportsUserData(context);
|
| - if (!state && gBrowserStateFromContext)
|
| - state = gBrowserStateFromContext(context);
|
| + if (!state && g_browser_state_from_context)
|
| + state = g_browser_state_from_context(context);
|
| DCHECK(state) << "cannot convert context to web::BrowserState";
|
| }
|
| return state;
|
|
|