Reduce some complexity in session_service_commands.cc

components/sessions/core/session_service_commands.cc

 // 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.
 
 #include "components/sessions/core/session_service_commands.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <utility>
 #include <vector>
@@ skipping 24 matching lines @@
 static const SessionCommand::id_type kCommandSetPinnedState = 12;
 static const SessionCommand::id_type kCommandSetExtensionAppID = 13;
 static const SessionCommand::id_type kCommandSetWindowBounds3 = 14;
 static const SessionCommand::id_type kCommandSetWindowAppName = 15;
 static const SessionCommand::id_type kCommandTabClosed = 16;
 static const SessionCommand::id_type kCommandWindowClosed = 17;
 static const SessionCommand::id_type kCommandSetTabUserAgentOverride = 18;
 static const SessionCommand::id_type kCommandSessionStorageAssociated = 19;
 static const SessionCommand::id_type kCommandSetActiveWindow = 20;
 static const SessionCommand::id_type kCommandLastActiveTime = 21;
 static const SessionCommand::id_type kCommandSetWindowWorkspace = 22;

[sky, 2016/05/06 21:31:49]

The format is now slightly different. You'll want to obsolete this like we did
on line 22. Basically comment this line out and create a new one at 23.

[Tom (Use chromium acct), 2016/05/06 22:14:50]

Done.

 
 namespace {
 
 // Various payload structures.
 struct ClosedPayload {
   SessionID::id_type id;
   int64_t close_time;
 };
 
 struct WindowBoundsPayload2 {
@@ skipping 521 matching lines @@
         }
         SessionTab* tab = GetTab(payload.tab_id, tabs);
         tab->last_active_time =
             base::TimeTicks::FromInternalValue(payload.last_active_time);
         break;
       }
 
       case kCommandSetWindowWorkspace: {
         std::unique_ptr<base::Pickle> pickle(command->PayloadAsPickle());
         base::PickleIterator it(*pickle);
-        const SessionID::id_type* window_id;
+        SessionID::id_type window_id;
         std::string workspace;
-        if (!it.ReadBytes(reinterpret_cast<const char**>(&window_id),
-                          sizeof(*window_id)) ||
-            !it.ReadString(&workspace)) {
+         if (!it.ReadInt(&window_id) || !it.ReadString(&workspace)) {
           DVLOG(1) << "Failed reading command " << command->id();
           return true;
         }
-        GetWindow(*window_id, windows)->workspace = workspace;
+        GetWindow(window_id, windows)->workspace = workspace;
         break;
       }
 
       default:
         // TODO(skuhne): This might call back into a callback handler to extend
         // the command set for specific implementations.
         DVLOG(1) << "Failed reading an unknown command " << command->id();
         return true;
     }
   }
@@ skipping 146 matching lines @@
   std::unique_ptr<SessionCommand> command(
       new SessionCommand(kCommandLastActiveTime, sizeof(payload)));
   memcpy(command->contents(), &payload, sizeof(payload));
   return command;
 }
 
 std::unique_ptr<SessionCommand> CreateSetWindowWorkspaceCommand(
     const SessionID& window_id,
     const std::string& workspace) {
   base::Pickle pickle;
-  pickle.WriteBytes(static_cast<const void*>(&window_id), sizeof(window_id));
+  pickle.WriteInt(window_id.id());
   pickle.WriteString(workspace);
   std::unique_ptr<SessionCommand> command(
-      new SessionCommand(kCommandSetWindowWorkspace, pickle.size()));
+      new SessionCommand(kCommandSetWindowWorkspace, pickle));
   memcpy(command->contents(), pickle.data(), pickle.size());

[sky, 2016/05/06 21:31:49]

This line shouldn't be necessary anymore.

[Tom (Use chromium acct), 2016/05/06 22:14:50]

Done.

   return command;
 }
 
 std::unique_ptr<SessionCommand> CreateTabNavigationPathPrunedFromBackCommand(
     const SessionID& tab_id,
     int count) {
   TabNavigationPathPrunedFromBackPayload payload = { 0 };
   payload.id = tab_id.id();
   payload.index = count;
   std::unique_ptr<SessionCommand> command(new SessionCommand(
@@ skipping 120 matching lines @@
     AddTabsToWindows(&tabs, &windows);
     SortTabsBasedOnVisualOrderAndPrune(&windows, valid_windows);
     UpdateSelectedTabIndex(valid_windows);
   }
   STLDeleteValues(&tabs);
   // Don't delete contents of windows, that is done by the caller as all
   // valid windows are added to valid_windows.
 }
 
 }  // namespace sessions