mash: Serialize ShelfIDs for property conversion and transport.

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 2013 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/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 
 #include <limits>
 #include <vector>
 
 #include "ash/public/cpp/window_properties.h"
@@ skipping 154 matching lines @@
     Browser* browser,
     content::WebContents* web_contents) {
   // We need to set the window ShelfID for V1 applications since they are
   // content which might change and as such change the application type.
   // The browser window may not exist in unit tests.
   if (!browser || !browser->window() || !browser->window()->GetNativeWindow() ||
       !IsBrowserFromActiveUser(browser) || IsSettingsBrowser(browser)) {
     return;
   }
 
+  const ash::ShelfID shelf_id =
+      ChromeLauncherController::instance()->GetShelfIDForWebContents(
+          web_contents);
   browser->window()->GetNativeWindow()->SetProperty(
-      ash::kShelfIDKey,
-      new ash::ShelfID(
-          ChromeLauncherController::instance()->GetShelfIDForWebContents(
-              web_contents)));
+      ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
 }
 
 void BrowserShortcutLauncherItemController::ItemSelected(
     std::unique_ptr<ui::Event> event,
     int64_t display_id,
     ash::ShelfLaunchSource source,
     const ItemSelectedCallback& callback) {
   if (event && (event->flags() & ui::EF_CONTROL_DOWN)) {
     chrome::NewEmptyWindow(ChromeLauncherController::instance()->profile());
     callback.Run(ash::SHELF_ACTION_NEW_WINDOW_CREATED, base::nullopt);
@@ skipping 208 matching lines @@
   Browser* browser = content::Source<Browser>(source).ptr();
   DCHECK(browser);
   BrowserList::BrowserVector::iterator item = std::find(
       browser_menu_items_.begin(), browser_menu_items_.end(), browser);
   DCHECK(item != browser_menu_items_.end());
   // Clear the entry for the closed browser and leave other indices intact.
   *item = nullptr;
   registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING,
                     content::Source<Browser>(browser));
 }