[Sync] Convert SyncSessionSnapshot to a copy-able class.

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2012 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 "chrome/browser/sync/sync_ui_util.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 527 matching lines @@
   } else {
     // This bypasses regular inter-thread communication mechanisms to grab a
     // very recent snapshot from the syncer thread.  It should be up to date
     // with the last snapshot emitted by the syncer.  Keep in mind, though, that
     // not all events that update these values will ping the UI thread, so you
     // might not see all intermediate values.
     sync_api::SyncManager::Status full_status(
         service->QueryDetailedSyncStatus());
 
     // This is a cache of the last snapshot of type SYNC_CYCLE_ENDED where
-    // !snapshot->has_more_to_sync.  In other words, it's the last in this
+    // !snapshot.has_more_to_sync().  In other words, it's the last in this
     // series of sync cycles.  The series ends only when we've done all we can
     // to resolve conflicts and there is nothing left to commit, or an error
     // occurs.
     //
     // Despite the fact that it is updated only at the end of a series of
     // commits, its values do not reflect the series.  Its counters are based on
     // the values from a single sync cycle.
     //
     // |snapshot| could be NULL if sync is not yet initialized.
-    const browser_sync::sessions::SyncSessionSnapshot* snapshot =
+    const browser_sync::sessions::SyncSessionSnapshot& snapshot =
         service->sync_initialized() ?
-        service->GetLastSessionSnapshot() : NULL;
+        service->GetLastSessionSnapshot() :
+        browser_sync::sessions::SyncSessionSnapshot();
 
     sync_ui_util::AddStringSyncDetails(sync_summary, "Summary",
                                        service->QuerySyncStatusSummary());
 
     ListValue* version_info = AddSyncDetailsSection(details, "Version Info");
     sync_ui_util::AddStringSyncDetails(version_info, "Client Version",
                                        GetVersionString());
     sync_ui_util::AddStringSyncDetails(version_info, "Server URL",
                                        service->sync_service_url().spec());
 
@@ skipping 21 matching lines @@
                                     service->sync_initialized());
 
     // Whether or not we're currently syncing.  Will almost always be false
     // because we do not usually update about:sync until a sync cycle has
     // completed.
     sync_ui_util::AddBoolSyncDetail(local_state, "Syncing",
                                     full_status.syncing);
 
     // Network status indicators.
     ListValue* network = AddSyncDetailsSection(details, "Network");
-    if (snapshot) {
-      sync_ui_util::AddBoolSyncDetail(network, "Throttled",
-                                      snapshot->is_silenced);
-    }
+    sync_ui_util::AddBoolSyncDetail(network, "Throttled",
+                                    snapshot.is_silenced());
     sync_ui_util::AddBoolSyncDetail(network, "Notifications Enabled",
                                     full_status.notifications_enabled);
 
     // Encryption status indicators.
     //
     // Only safe to call IsUsingSecondaryPassphrase() if the backend is
     // initialized already - otherwise, we have no idea whether we are
     // using a secondary passphrase or not.
     ListValue* encryption = AddSyncDetailsSection(details, "Encryption");
     if (service->sync_initialized()) {
@@ skipping 10 matching lines @@
     sync_ui_util::AddBoolSyncDetail(encryption,
                                     "Cryptographer Has Pending Keys",
                                     full_status.crypto_has_pending_keys);
     sync_ui_util::AddStringSyncDetails(encryption,
         "Encrypted Types",
         syncable::ModelTypeSetToString(full_status.encrypted_types));
 
 
     ListValue* cycles = AddSyncDetailsSection(
         details, "Status from Last Completed Session");
-    if (snapshot) {
-      sync_ui_util::AddStringSyncDetails(
-          cycles, "Sync Source",
-          browser_sync::GetUpdatesSourceString(
-          snapshot->source.updates_source));
-      sync_ui_util::AddStringSyncDetails(
-          cycles, "Download Updates",
-          GetSyncerErrorString(snapshot->errors.last_download_updates_result));
-      sync_ui_util::AddStringSyncDetails(
-          cycles, "Post Commit",
-          GetSyncerErrorString(snapshot->errors.last_post_commit_result));
-      sync_ui_util::AddStringSyncDetails(
-          cycles, "Process Commit Response",
-          GetSyncerErrorString(
-              snapshot->errors.last_process_commit_response_result));
-    }
+    sync_ui_util::AddStringSyncDetails(
+        cycles, "Sync Source",
+        browser_sync::GetUpdatesSourceString(
+        snapshot.source().updates_source));
+    sync_ui_util::AddStringSyncDetails(
+        cycles, "Download Updates",
+        GetSyncerErrorString(snapshot.errors().last_download_updates_result));
+    sync_ui_util::AddStringSyncDetails(
+        cycles, "Post Commit",
+        GetSyncerErrorString(snapshot.errors().last_post_commit_result));
+    sync_ui_util::AddStringSyncDetails(
+        cycles, "Process Commit Response",
+        GetSyncerErrorString(
+            snapshot.errors().last_process_commit_response_result));
 
     // Strictly increasing counters.
     ListValue* counters = AddSyncDetailsSection(details, "Running Totals");
     sync_ui_util::AddIntSyncDetail(counters,
                                    "Notifications Received",
                                    full_status.notifications_received);
 
     sync_ui_util::AddIntSyncDetail(counters,
                                    "Cycles Without Updates",
                                    full_status.empty_get_updates);
@@ skipping 53 matching lines @@
 
     sync_ui_util::AddIntSyncDetail(
         transient_cycle, "Committed Items",
         full_status.committed_count);
     sync_ui_util::AddIntSyncDetail(
         transient_cycle, "Updates Remaining",
         full_status.updates_available);
 
     ListValue* transient_session = AddSyncDetailsSection(
         details, "Transient Counters (last cycle of last completed session)");
-    if (snapshot) {
-      sync_ui_util::AddIntSyncDetail(
-          transient_session, "Updates Downloaded",
-          snapshot->syncer_status.num_updates_downloaded_total);
-      sync_ui_util::AddIntSyncDetail(
-          transient_session, "Committed Count",
-          snapshot->syncer_status.num_successful_commits);
-    }
+    sync_ui_util::AddIntSyncDetail(
+        transient_session, "Updates Downloaded",
+        snapshot.syncer_status().num_updates_downloaded_total);
+    sync_ui_util::AddIntSyncDetail(
+        transient_session, "Committed Count",
+        snapshot.syncer_status().num_successful_commits);
 
-    if (snapshot) {
-      // This counter is stale.  The warnings related to the snapshot still
-      // apply, see the comments near call to GetLastSessionSnapshot() above.
-      // Also, because this is updated only following a complete sync cycle,
-      // local changes affecting this count will not be displayed until the
-      // syncer has attempted to commit those changes.
-      sync_ui_util::AddIntSyncDetail(transient_session, "Entries",
-                                     snapshot->num_entries);
-    }
+    // This counter is stale.  The warnings related to the snapshot still
+    // apply, see the comments near call to GetLastSessionSnapshot() above.
+    // Also, because this is updated only following a complete sync cycle,
+    // local changes affecting this count will not be displayed until the
+    // syncer has attempted to commit those changes.
+    sync_ui_util::AddIntSyncDetail(transient_session, "Entries",
+                                   snapshot.num_entries());
 
     // Now set the actionable errors.
     if ((full_status.sync_protocol_error.error_type !=
          browser_sync::UNKNOWN_ERROR) &&
         (full_status.sync_protocol_error.error_type !=
          browser_sync::SYNC_SUCCESS)) {
       strings->Set("actionable_error_detected",
                    base::Value::CreateBooleanValue(true));
       ListValue* actionable_error = new ListValue();
       strings->Set("actionable_error", actionable_error);
@@ skipping 66 matching lines @@
     }
   } else {
     version_modifier = " " + version_modifier;
   }
   return chrome_version.Name() + " " + chrome_version.OSType() + " " +
       chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
       version_modifier;
 }
 
 }  // namespace sync_ui_util