mash: Serialize ShelfIDs for property conversion and transport.

ash/wm/panels/panel_layout_manager_unittest.cc

Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 8db7033f15f581706acca07dcf543b3413026487..07cc324d55437aebe8ea738ece7406661016c5dd 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -90,7 +90,8 @@ class PanelLayoutManagerTest : public test::AshTestBase {
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         delegate, ui::wm::WINDOW_TYPE_PANEL, 0, bounds);
     static int id = 0;
-    window->SetProperty(kShelfIDKey, new ShelfID(base::IntToString(id++)));
+    std::string shelf_id(ash::ShelfID(base::IntToString(id++)).Serialize());

[James Cook, 2017/05/15 16:37:23]

Am I missing something obvious about ash:: for ShelfID? Is there another
ShelfID?

[msw, 2017/05/15 19:21:32]

Nope, I was just copy-pasting and missed the namespacing.

+    window->SetProperty(kShelfIDKey, new std::string(shelf_id));
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
     return window;
   }
@@ -219,9 +220,10 @@ class PanelLayoutManagerTest : public test::AshTestBase {
     test::ShelfViewTestAPI test_api(shelf_view);
     test_api.SetAnimationDuration(1);
     test_api.RunMessageLoopUntilAnimationsDone();
-    ShelfID* shelf_id = window->GetProperty(kShelfIDKey);
-    DCHECK(shelf_id);
-    int index = Shell::Get()->shelf_model()->ItemIndexByID(*shelf_id);
+    ShelfID shelf_id = ShelfID::Deserialize(window->GetProperty(kShelfIDKey));
+    DCHECK(!shelf_id.IsNull());
+    int index = Shell::Get()->shelf_model()->ItemIndexByID(shelf_id);
+    DCHECK_GE(index, 0);
     gfx::Rect bounds = test_api.GetButton(index)->GetBoundsInScreen();
 
     ui::test::EventGenerator& event_generator = GetEventGenerator();