Disable ServiceWorker when JS is disabled

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 5a03ae340327b199b86239b4e4e323f9dcdfba88..8a43bb96891dd02ce11a0a3dcc323debda76abd6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1783,10 +1783,20 @@ bool ChromeContentBrowserClient::AllowServiceWorker(
   }
 #endif
 
+  // Check if Cookie is allowed

[falken, 2016/09/28 13:51:27]

nit: add a period to the end of comments:
https://google.github.io/styleguide/cppguide.html#Punctuation,_Spelling_and_G...

"Check if cookies are allowed." is more natural.

[shimazu, 2016/09/29 04:26:34]

Done.

   ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
   bool allow = io_data->GetCookieSettings()->IsSettingCookieAllowed(
       scope, first_party_url);
 
+  // Check if JS is allowed

[falken, 2016/09/28 13:51:27]

nit: same

[shimazu, 2016/09/29 04:26:34]

Done.

+  content_settings::SettingInfo info;
+  std::unique_ptr<base::Value> value =
+      io_data->GetHostContentSettingsMap()->GetWebsiteSetting(
+          first_party_url, first_party_url, CONTENT_SETTINGS_TYPE_JAVASCRIPT,
+          std::string(), &info);
+  ContentSetting setting = content_settings::ValueToContentSetting(value.get());
+  allow = allow && (setting == CONTENT_SETTING_ALLOW);
+
   // Record access to database for potential display in UI.
   // Only post the task if this is for a specific frame.
   if (render_process_id != -1 && render_frame_id != -1) {