Merge pull request #4763 from brave/issue_8419_wayback

Make wayback url request to use per-profile SharedLoaderFactory
brave · Feb 27, 2020 · dd241fa · dd241fa
2 parents ba18018 + bf189f1
commit dd241fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc b/browser/ui/views/infobars/brave_wayback_machine_infobar_contents_view.cc
@@ -16,12 +16,13 @@
 #include "brave/grit/brave_generated_resources.h"
 #include "brave/grit/brave_theme_resources.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/net/system_network_context_manager.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/chrome_typography.h"
 #include "components/grit/components_scaled_resources.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -55,8 +56,9 @@ BraveWaybackMachineInfoBarContentsView::BraveWaybackMachineInfoBarContentsView(
       contents_(contents),
       wayback_machine_url_fetcher_(
           this,
-          SystemNetworkContextManager::GetInstance()->
-              GetSharedURLLoaderFactory()) {
+          content::BrowserContext::GetDefaultStoragePartition(
+              contents->GetBrowserContext())->
+                  GetURLLoaderFactoryForBrowserProcess()) {
   SetLayoutManager(std::make_unique<views::FlexLayout>());
   InitializeChildren();
 }

diff --git a/components/brave_wayback_machine/wayback_machine_url_fetcher.cc b/components/brave_wayback_machine/wayback_machine_url_fetcher.cc
@@ -11,6 +11,7 @@
 #include "base/json/json_reader.h"
 #include "brave/components/brave_wayback_machine/url_constants.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
+#include "net/base/load_flags.h"
 #include "services/network/public/cpp/resource_request.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "services/network/public/cpp/simple_url_loader.h"
@@ -58,6 +59,8 @@ void WaybackMachineURLFetcher::Fetch(const GURL& url) {
   std::string wayback_fetch_url =
       std::string(kWaybackQueryURL) + url.spec();
   request->url = GURL(wayback_fetch_url);
+  request->load_flags =
+      net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES;
   wayback_url_loader_ = network::SimpleURLLoader::Create(
       std::move(request), GetNetworkTrafficAnnotationTag());
   wayback_url_loader_->DownloadToString(