Make a bunch of CrOS-only fields CrOS-only

This makes it more obvious that state is only relevant for the
CrOS-specific stuff, which should make it easier to split out.

Bug: 125848
Change-Id: I45da1f43a2584271d9ec5aad07460200f9e948cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857040
Auto-Submit: David Benjamin <davidben@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Commit-Queue: David Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705355}

crypto/nss_util.cc

@@ -645,11 +645,7 @@ class NSSInitSingleton {
  private:
   friend struct base::LazyInstanceTraitsBase<NSSInitSingleton>;
 
-  NSSInitSingleton()
-      : tpm_token_enabled_for_nss_(false),
-        initializing_tpm_token_(false),
-        chaps_module_(nullptr),
-        root_(nullptr) {
+  NSSInitSingleton() {
     // Initializing NSS causes us to do blocking IO.
     // Temporarily allow it until we fix
     //   http://code.google.com/p/chromium/issues/detail?id=59847
@@ -768,14 +764,14 @@ class NSSInitSingleton {
     return module;
   }
 
-  bool tpm_token_enabled_for_nss_;
-  bool initializing_tpm_token_;
-  typedef std::vector<base::OnceClosure> TPMReadyCallbackList;
+  SECMODModule* root_ = nullptr;
+#if defined(OS_CHROMEOS)
+  bool tpm_token_enabled_for_nss_ = false;
+  bool initializing_tpm_token_ = false;
+  using TPMReadyCallbackList = std::vector<base::OnceClosure>;
   TPMReadyCallbackList tpm_ready_callback_list_;
-  SECMODModule* chaps_module_;
+  SECMODModule* chaps_module_ = nullptr;
   crypto::ScopedPK11Slot tpm_slot_;
-  SECMODModule* root_;
-#if defined(OS_CHROMEOS)
   std::map<std::string, std::unique_ptr<ChromeOSUserData>> chromeos_user_map_;
   ScopedPK11Slot test_system_slot_;
   ScopedPK11Slot prepared_test_private_slot_;