Snapshot of all changes to get jumbo in blink and content.

content/browser/loader/navigation_url_loader.cc

Index: content/browser/loader/navigation_url_loader.cc
diff --git a/content/browser/loader/navigation_url_loader.cc b/content/browser/loader/navigation_url_loader.cc
index e12f666dd580c9e2891bfdbd41dc3e9d64d829a5..2663142dc625e2d99ee49cc4a7ebfead5f335543 100644
--- a/content/browser/loader/navigation_url_loader.cc
+++ b/content/browser/loader/navigation_url_loader.cc
@@ -17,7 +17,7 @@
 
 namespace content {
 
-static NavigationURLLoaderFactory* g_factory = nullptr;
+static NavigationURLLoaderFactory* g_loader_factory = nullptr;
 
 std::unique_ptr<NavigationURLLoader> NavigationURLLoader::Create(
     ResourceContext* resource_context,
@@ -27,8 +27,8 @@ std::unique_ptr<NavigationURLLoader> NavigationURLLoader::Create(
     ServiceWorkerNavigationHandle* service_worker_handle,
     AppCacheNavigationHandle* appcache_handle,
     NavigationURLLoaderDelegate* delegate) {
-  if (g_factory) {
-    return g_factory->CreateLoader(
+  if (g_loader_factory) {
+    return g_loader_factory->CreateLoader(
         resource_context, storage_partition, std::move(request_info),
         std::move(navigation_ui_data), service_worker_handle, delegate);
   }
@@ -47,8 +47,8 @@ std::unique_ptr<NavigationURLLoader> NavigationURLLoader::Create(
 
 void NavigationURLLoader::SetFactoryForTesting(
     NavigationURLLoaderFactory* factory) {
-  DCHECK(g_factory == nullptr || factory == nullptr);
-  g_factory = factory;
+  DCHECK(g_loader_factory == nullptr || factory == nullptr);
+  g_loader_factory = factory;
 }
 
 }  // namespace content