wip

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_io_data.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 111 matching lines @@
 #endif
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/content_protocol_handler.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider.h"
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h"
 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h"
+#include "chrome/browser/chromeos/file_request_interceptor.h"
 #include "chrome/browser/chromeos/fileapi/external_file_protocol_handler.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
 #include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h"
 #include "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 1023 matching lines @@
       url::kDataScheme, base::MakeUnique<net::DataProtocolHandler>());
   DCHECK(set_protocol);
 #if defined(OS_CHROMEOS)
   if (profile_params_) {
     set_protocol = job_factory->SetProtocolHandler(
         content::kExternalFileScheme,
         base::MakeUnique<chromeos::ExternalFileProtocolHandler>(
             profile_params_->profile));
     DCHECK(set_protocol);
   }
+  request_interceptors.push_back(
+      base::MakeUnique<chromeos::FileRequestInterceptor>());

[eroman, 2017/04/04 22:19:45]

You will want mmenke to review this change. In fact he can probably advise you
better on the overall approach.

In general I would say we don't want to use an interceptor for this. If we
substitute at this level, how about changing the location a few lines above:

  job_factory->SetProtocolHandler(url::kFileScheme, ...);

And injecting the ChromeOS specific file:// handler there.

That said, I am not sure I understand why the NetworkDelegate based approach did
not work. My understanding is you ran into problems with OfflinePageRequestJob
on Android? I don't know anything about that class, but that would suggest it
isn't using the file job appropriately, or can be modified in how it calls.

Lastly, I should point out that either of these approaches is only going to
allow blacklisting paths from within profile-initiated requests. file://URLs
that come from other contexts may not flow through that. Notably, I expect that
if you specify a file:// URL for a PAC script it will not go through any of
these checks as it is using a different URLRequestContext.

 #endif  // defined(OS_CHROMEOS)
 #if defined(OS_ANDROID)
   set_protocol = job_factory->SetProtocolHandler(
       url::kContentScheme,
       content::ContentProtocolHandler::Create(
           content::BrowserThread::GetBlockingPool()
               ->GetTaskRunnerWithShutdownBehavior(
                   base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
 #endif
 
@@ skipping 125 matching lines @@
 void ProfileIOData::SetCookieSettingsForTesting(
     content_settings::CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }
 
 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
     const GURL& url) const {
   return url_blacklist_manager_->GetURLBlacklistState(url);
 }