DevTools: move the force update SW on reload checkbox to the Resources / Service Workers view.

content/browser/devtools/protocol/service_worker_handler.cc

 // Copyright 2015 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 "content/browser/devtools/protocol/service_worker_handler.h"
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 115 matching lines @@
 }
 
 scoped_refptr<ServiceWorkerRegistration> CreateRegistrationDictionaryValue(
     const ServiceWorkerRegistrationInfo& registration_info) {
   scoped_refptr<ServiceWorkerRegistration> registration(
       ServiceWorkerRegistration::Create()
           ->set_registration_id(
               base::Int64ToString(registration_info.registration_id))
           ->set_scope_url(registration_info.pattern.spec())
           ->set_is_deleted(registration_info.delete_flag ==
-                           ServiceWorkerRegistrationInfo::IS_DELETED)
-          ->set_force_update_on_page_load(
-              registration_info.force_update_on_page_load ==
-              ServiceWorkerRegistrationInfo::IS_FORCED));
+                           ServiceWorkerRegistrationInfo::IS_DELETED));
   return registration;
 }
 
 scoped_refptr<ServiceWorkerDevToolsAgentHost> GetMatchingServiceWorker(
     const ServiceWorkerDevToolsAgentHost::List& agent_hosts,
     const GURL& url) {
   scoped_refptr<ServiceWorkerDevToolsAgentHost> best_host;
   bool best_host_scope_matched = false;
   int best_host_scope_length = 0;
 
@@ skipping 272 matching lines @@
   return Response::OK();
 }
 
 Response ServiceWorkerHandler::SetDebugOnStart(bool debug_on_start) {
   ServiceWorkerDevToolsManager::GetInstance()
       ->set_debug_service_worker_on_start(debug_on_start);
   return Response::OK();
 }
 
 Response ServiceWorkerHandler::SetForceUpdateOnPageLoad(
-    const std::string& registration_id,
     bool force_update_on_page_load) {
   if (!context_)
     return CreateContextErrorResponse();
-  int64_t id = kInvalidServiceWorkerRegistrationId;
-  if (!base::StringToInt64(registration_id, &id))
-    return CreateInvalidVersionIdErrorResponse();
-  if (force_update_on_page_load)
-    force_update_enabled_registrations_.insert(id);
-  else
-    force_update_enabled_registrations_.erase(id);
-  context_->SetForceUpdateOnPageLoad(id, force_update_on_page_load);
+  context_->SetForceUpdateOnPageLoad(force_update_on_page_load);
   return Response::OK();
 }
 
 Response ServiceWorkerHandler::DeliverPushMessage(
     const std::string& origin,
     const std::string& registration_id,
     const std::string& data) {
   if (!enabled_)
     return Response::OK();
   if (!render_frame_host_)
@@ skipping 155 matching lines @@
   auto it = attached_hosts_.find(host->GetId());
   if (it == attached_hosts_.end())
     return;
   host->DetachClient();
   client_->WorkerTerminated(WorkerTerminatedParams::Create()->
       set_worker_id(host->GetId()));
   attached_hosts_.erase(it);
 }
 
 void ServiceWorkerHandler::ClearForceUpdate() {
-  if (context_) {
-    for (const auto registration_id : force_update_enabled_registrations_)
-      context_->SetForceUpdateOnPageLoad(registration_id, false);
-  }
-  force_update_enabled_registrations_.clear();
+  if (context_)
+    context_->SetForceUpdateOnPageLoad(false);
 }
 
 }  // namespace service_worker
 }  // namespace devtools
 }  // namespace content