[BackgroundSync] Add new registration options from the spec

content/browser/background_sync/background_sync_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_MANAGER_H_
 #define CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_MANAGER_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "content/browser/background_sync/background_sync.pb.h"
 #include "content/browser/cache_storage/cache_storage_scheduler.h"
 #include "content/browser/service_worker/service_worker_context_observer.h"
 #include "content/browser/service_worker/service_worker_storage.h"
 #include "content/common/content_export.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class ServiceWorkerContextWrapper;
@@ skipping 20 matching lines @@
     ERROR_TYPE_OK = 0,
     ERROR_TYPE_STORAGE,
     ERROR_TYPE_NOT_FOUND
   };
 
   // TODO(jkarlin): Remove this and use the struct from IPC messages once it
   // lands.
   struct CONTENT_EXPORT BackgroundSyncRegistration {
     using RegistrationId = int64;
     static const RegistrationId kInvalidRegistrationId;
-
     BackgroundSyncRegistration()
-        : BackgroundSyncRegistration(kInvalidRegistrationId, "") {}
-    explicit BackgroundSyncRegistration(const std::string& name)
-        : BackgroundSyncRegistration(kInvalidRegistrationId, name) {}
-    BackgroundSyncRegistration(int64 id, const std::string& name)
-        : id(id), min_period(0), name(name) {}
+        : id(kInvalidRegistrationId),

[johnme, 2015/04/07 17:05:12]

Nit: easier to read if you remove this constructor, and just use C++11
Non-Static Class Member Initializers*, e.g.:

    bool fire_once = true;

*: (allowed by https://chromium-cpp.appspot.com)

[jkarlin, 2015/04/07 17:55:06]

Done.

+          fire_once(true),
+          min_period(0),
+          network_state(NETWORK_STATE_ONLINE),
+          power_state(POWER_STATE_AVOID_DRAINING) {}
 
     bool Equals(const BackgroundSyncRegistration& other) {
-      return this->name == other.name && this->min_period == other.min_period;
+      return this->name == other.name && this->fire_once == other.fire_once &&
+             this->min_period == other.min_period &&
+             network_state == other.network_state &&
+             power_state == other.power_state;
     }
 
     RegistrationId id;
+    std::string name;
+    bool fire_once;
     int64 min_period;
-    std::string name;
+    SyncNetworkState network_state;
+    SyncPowerState power_state;
   };
 
   struct CONTENT_EXPORT BackgroundSyncRegistrations {
     using NameToRegistrationMap =
         std::map<std::string, BackgroundSyncRegistration>;
     static const BackgroundSyncRegistration::RegistrationId kInitialId;
 
     BackgroundSyncRegistrations();
     explicit BackgroundSyncRegistrations(
         BackgroundSyncRegistration::RegistrationId next_id);
@@ skipping 166 matching lines @@
   bool disabled_;
 
   base::WeakPtrFactory<BackgroundSyncManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundSyncManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_MANAGER_H_