Fix file access on Chrome for ChromeOS on Linux

net/base/network_delegate.h

Index: net/base/network_delegate.h
diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index 34909ea04320c2593315bd4e910778c5cafd4245..cd7028a7950374c8c39a705d47065f3c10fd34c5 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -14,6 +14,7 @@
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"
 
+class FilePath;
 class GURL;
 
 namespace net {
@@ -77,14 +78,16 @@ class NetworkDelegate : public base::NonThreadSafe {
                                           const AuthChallengeInfo& auth_info,
                                           const AuthCallback& callback,
                                           AuthCredentials* credentials);
-  bool NotifyReadingCookies(const URLRequest* request,
-                            const CookieList& cookie_list);
-  bool NotifySettingCookie(const URLRequest* request,
-                           const std::string& cookie_line,
-                           CookieOptions* options);
+  bool CanGetCookies(const URLRequest& request,
+                     const CookieList& cookie_list);
+  bool CanSetCookie(const URLRequest& request,
+                    const std::string& cookie_line,
+                    CookieOptions* options);
+  bool CanAccessFile(const URLRequest& request,
+                     const FilePath& path) const;
 
  private:
-  // This is the interface for subclasses of NetworkDelegate to implement. This
+  // This is the interface for subclasses of NetworkDelegate to implement. These
   // member functions will be called by the respective public notification
   // member function, which will perform basic sanity checking.
 
@@ -182,15 +185,22 @@ class NetworkDelegate : public base::NonThreadSafe {
   // Called when reading cookies to allow the network delegate to block access
   // to the cookie. This method will never be invoked when
   // LOAD_DO_NOT_SEND_COOKIES is specified.
-  virtual bool CanGetCookies(const URLRequest* request,
-                             const CookieList& cookie_list) = 0;
+  virtual bool CanGetCookiesInternal(const URLRequest& request,

[darin (slow to review), 2012/05/04 06:49:31]

Why are you using the "Internal" suffix here?  It seems like subclasses are
expected to implement these methods, and yet it seems suboptimal for subclasses
to implement internal methods.  Such a suffix seems to suggest something private
or internal to the class that defines them.

Also, this Internal naming isn't consistent with the rest of the NetworkDelegate
interface, which maps concrete NotifyFoo methods to OnFoo virtual methods. 
Should those instead be virtual NofifyFooInternal methods?  Or, should these be
OnCanGetCookies, OnCanSetCookie and OnCanAccessFile instead?

[Greg Spencer (Chromium), 2012/05/05 02:46:19]

Well, the "Internal" was a suggestion from another reviewer,  but I think you're
right: OnCanGetCookies, etc. is better.  Luckily I forgot to check the commit
box, so I've fixed this.

+                                     const CookieList& cookie_list) = 0;
 
   // Called when a cookie is set to allow the network delegate to block access
   // to the cookie. This method will never be invoked when
   // LOAD_DO_NOT_SAVE_COOKIES is specified.
-  virtual bool CanSetCookie(const URLRequest* request,
-                            const std::string& cookie_line,
-                            CookieOptions* options) = 0;
+  virtual bool CanSetCookieInternal(const URLRequest& request,
+                                    const std::string& cookie_line,
+                                    CookieOptions* options) = 0;
+
+
+  // Called when a file access is attempted to allow the network delegate to
+  // allow or block access to the given file path.  Returns true if access is
+  // allowed.
+  virtual bool CanAccessFileInternal(const URLRequest& request,
+                                     const FilePath& path) const = 0;
 
 };