Merge 138112 - NTP: Prevent tab sync icons from being cached.

chrome/browser/ui/webui/session_favicon_source.h

Index: chrome/browser/ui/webui/session_favicon_source.h
===================================================================
--- chrome/browser/ui/webui/session_favicon_source.h	(revision 140618)
+++ chrome/browser/ui/webui/session_favicon_source.h	(working copy)
@@ -19,15 +19,13 @@
  public:
   explicit SessionFaviconSource(Profile* profile);
 
-  // Called when the network layer has requested a resource underneath
-  // the path we registered.
+  // FaviconSource implementation.
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id) OVERRIDE;
-
   virtual std::string GetMimeType(const std::string&) const OVERRIDE;
-
   virtual bool ShouldReplaceExistingSource() const OVERRIDE;
+  virtual bool AllowCaching() const OVERRIDE;
 
  protected:
   virtual ~SessionFaviconSource();