Disable ServiceWorker when JS is disabled

chrome/browser/content_settings/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 145 matching lines @@
   // If access was blocked due to the user's content settings,
   // |blocked_by_policy| should be true, and this function should invoke
   // OnContentBlocked.
   static void FileSystemAccessed(int render_process_id,
                                  int render_frame_id,
                                  const GURL& url,
                                  bool blocked_by_policy);
 
   // Called when a specific Service Worker scope was accessed.
   // If access was blocked due to the user's content settings,
   // |blocked_by_policy| should be true, and this function should invoke

[falken, 2016/10/05 01:16:50]

nit: update this comment: there is no longer a |blocked_by_policy| parameter.

[shimazu, 2016/10/05 02:10:57]

Done.

   // OnContentBlocked.
   static void ServiceWorkerAccessed(int render_process_id,
                                     int render_frame_id,
                                     const GURL& scope,
-                                    bool blocked_by_policy);
+                                    bool blocked_by_policy_javascript,
+                                    bool blocked_by_policy_cookie);
 
   // Resets the |content_blocked_| and |content_allowed_| arrays, except for
   // CONTENT_SETTINGS_TYPE_COOKIES related information.

[falken, 2016/10/05 01:16:50]

This comment is no longer true. Now it's COOKIES and JAVASCRIPT. Can you also
add a comment explaining why COOKIES and JAVASCRIPT are ones excepted? What is
special about those two?

Actually the comment is already wrong, there is no longer |content_blocked_| and
|content_allowed_| arrays.

The naming is also inconsistent with ClearNavigationRelatedContentSettings. It
should just be ClearContentSettingsExceptForNavigationRelatedSettings, doesn't
need the "Blocked".

[shimazu, 2016/10/05 02:10:57]

Done.

   // TODO(vabr): Only public for tests. Move to a test client.
-  void ClearBlockedContentSettingsExceptForCookies();
+  void ClearBlockedContentSettingsExceptForNavigationRelatedSettings();
 
   // Resets all cookies related information.

[falken, 2016/10/05 01:16:50]

ditto

[shimazu, 2016/10/05 02:10:57]

Done.

   // TODO(vabr): Only public for tests. Move to a test client.
-  void ClearCookieSpecificContentSettings();
+  void ClearNavigationRelatedContentSettings();
 
   // Changes the |content_blocked_| entry for popups.
   void SetPopupsBlocked(bool blocked);
 
   // Changes the |content_blocked_| entry for downloads.
   void SetDownloadsBlocked(bool blocked);
 
   // Changes |subresource_filter_enabled_| entry for the Safe Browsing
   // Subresource Filter.
   void SetSubresourceBlocked(bool enabled);
@@ skipping 153 matching lines @@
                        const net::CookieOptions& options,
                        bool blocked_by_policy);
   void OnFileSystemAccessed(const GURL& url,
                             bool blocked_by_policy);
   void OnIndexedDBAccessed(const GURL& url,
                            const base::string16& description,
                            bool blocked_by_policy);
   void OnLocalStorageAccessed(const GURL& url,
                               bool local,
                               bool blocked_by_policy);
-  void OnServiceWorkerAccessed(const GURL& scope, bool blocked_by_policy);
+  void OnServiceWorkerAccessed(const GURL& scope,
+                               bool blocked_by_policy_javascript,
+                               bool blocked_by_policy_cookie);
   void OnWebDatabaseAccessed(const GURL& url,
                              const base::string16& name,
                              const base::string16& display_name,
                              bool blocked_by_policy);
   void OnGeolocationPermissionSet(const GURL& requesting_frame,
                                   bool allowed);
   void OnDidUseKeygen(const GURL& url);
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
   void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame,
                                                bool allowed);
@@ skipping 126 matching lines @@
   // Holds the previous committed url during a navigation.
   GURL previous_url_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_