M52: Merge "Reland: service worker: Don't control a subframe of an insecure context"

content/common/service_worker/service_worker_types.h

 // Copyright 2014 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 CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_
 #define CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 48 matching lines @@
   SERVICE_WORKER_PROVIDER_UNKNOWN,
 
   // For ServiceWorker clients.
   SERVICE_WORKER_PROVIDER_FOR_WINDOW,
   SERVICE_WORKER_PROVIDER_FOR_WORKER,
   SERVICE_WORKER_PROVIDER_FOR_SHARED_WORKER,
 
   // For ServiceWorkers.
   SERVICE_WORKER_PROVIDER_FOR_CONTROLLER,
 
-  // For sandboxed frames.
-  SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME,
-
   SERVICE_WORKER_PROVIDER_TYPE_LAST =
-      SERVICE_WORKER_PROVIDER_FOR_SANDBOXED_FRAME
+      SERVICE_WORKER_PROVIDER_FOR_CONTROLLER
 };
 
 // The enum entries below are written to histograms and thus cannot be deleted
 // or reordered.
 // New entries must be added immediately before the end.
 enum FetchRequestMode {
   FETCH_REQUEST_MODE_SAME_ORIGIN,
   FETCH_REQUEST_MODE_NO_CORS,
   FETCH_REQUEST_MODE_CORS,
   FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT,
@@ skipping 165 matching lines @@
       const ServiceWorkerObjectInfo& service_worker_info);
 
   // Exactly one of these infos should be valid.
   ServiceWorkerClientInfo client_info;
   ServiceWorkerObjectInfo service_worker_info;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_SERVICE_WORKER_SERVICE_WORKER_TYPES_H_