Fix file access on Chrome for ChromeOS on Linux

net/url_request/url_request.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 "net/url_request/url_request.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 319 matching lines @@
 bool URLRequest::IsHandledURL(const GURL& url) {
   if (!url.is_valid()) {
     // We handle error cases.
     return true;
   }
 
   return IsHandledProtocol(url.scheme());
 }
 
 // static
-void URLRequest::AllowFileAccess() {
-  URLRequestJobManager::GetInstance()->set_enable_file_access(true);
+void URLRequest::AllowAccessToAllFiles() {
+  URLRequestJobManager::GetInstance()->set_file_access_allowed(true);
 }
 
-// static
-bool URLRequest::IsFileAccessAllowed() {
-  return URLRequestJobManager::GetInstance()->enable_file_access();
+bool URLRequest::IsFileAccessAllowed(const FilePath& path) {
+  if (URLRequestJobManager::GetInstance()->file_access_allowed())

[willchan no longer on Chromium, 2012/04/19 21:12:24]

From what I can tell, all this code was added purely for chromeos. Can you just
kill it all? I think that the only code we should have in net/ is the code in
URLRequestFileJob to look for
URLRequestContext=>NetworkDelegate=>CanAccessFile() and the member function in
NetworkDelegate. URLRequest and URLRequestJobManager should have none of this
code. ChromeNetworkDelegate can have it, and for CrOs tests, it can call a class
static member function in ChromeNetworkDelegate instead of on URLRequest to
allow access to all files.

willchan@penguin:/usr/local/google/chromium1/src$ git gs enable_file_access
net/url_request/url_request.cc:341: 
URLRequestJobManager::GetInstance()->set_enable_file_access(true);
net/url_request/url_request.cc:346:  return
URLRequestJobManager::GetInstance()->enable_file_access();
net/url_request/url_request_job_manager.cc:268:      enable_file_access_(false)
{
net/url_request/url_request_job_manager.h:68:  void set_enable_file_access(bool
enable) { enable_file_access_ = enable; }
net/url_request/url_request_job_manager.h:69:  bool enable_file_access() const {
return enable_file_access_; }
net/url_request/url_request_job_manager.h:111:  bool enable_file_access_;

willchan@penguin:/usr/local/google/chromium1/src$ git gs "AllowFileAccess()"
chrome/browser/chromeos/chrome_browser_main_chromeos.cc:341:   
net::URLRequest::AllowFileAccess();
net/proxy/proxy_script_fetcher_impl_unittest.cc:128:   
URLRequest::AllowFileAccess();
net/url_request/url_request.cc:340:void URLRequest::AllowFileAccess() {
net/url_request/url_request.h:306:  static void AllowFileAccess();
net/url_request/url_request_unittest.cc:415:    URLRequest::AllowFileAccess();

willchan@penguin:/usr/local/google/chromium1/src$ git gs "IsFileAccessAllowed()"
net/url_request/url_request.cc:345:bool URLRequest::IsFileAccessAllowed() {
net/url_request/url_request.h:307:  static bool IsFileAccessAllowed();
net/url_request/url_request_file_job.cc:136:  if
(URLRequest::IsFileAccessAllowed()) {  // for tests.

[Greg Spencer (Chromium), 2012/04/20 00:05:54]

Yeah, you're right.  I've moved almost all of it either into the
URLRequestFileJob or into the ChromeNetworkDelegate.  I had to leave a static on
URLRequestFileJob to override the delegate because there is one platform test in
net/ that relies on having access to file:// URLs
(proxy_script_fetcher_impl_unittest.cc) and since it's in net/, it can't call a
ChromeNetworkDelegate function, but I think I've made it as minimal as possible.

[willchan no longer on Chromium, 2012/04/20 00:14:03]

Can you get rid of that and just set a NetworkDelegate subclass?

[Greg Spencer (Chromium), 2012/04/20 19:21:28]

Duh, that would be better. :-) Done.

+    return true;
+  if (context_ && context_->network_delegate())
+    return context_->network_delegate()->NotifyFileAccessRequested(this, path);
+  return false;
 }
 
 void URLRequest::set_first_party_for_cookies(
     const GURL& first_party_for_cookies) {
   first_party_for_cookies_ = first_party_for_cookies;
 }
 
 void URLRequest::set_method(const std::string& method) {
   DCHECK(!is_pending_);
   method_ = method;
@@ skipping 519 matching lines @@
 
 void URLRequest::SetUnblockedOnDelegate() {
   if (!blocked_on_delegate_)
     return;
   blocked_on_delegate_ = false;
   load_state_param_.clear();
   net_log_.EndEvent(NetLog::TYPE_URL_REQUEST_BLOCKED_ON_DELEGATE, NULL);
 }
 
 }  // namespace net