mash: Serialize ShelfIDs for property conversion and transport.

ash/wm/panels/panel_layout_manager_unittest.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 "ash/wm/panels/panel_layout_manager.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 72 matching lines @@
 
   aura::Window* CreateNormalWindow(const gfx::Rect& bounds) {
     return CreateTestWindowInShellWithBounds(bounds);
   }
 
   aura::Window* CreatePanelWindowWithDelegate(aura::WindowDelegate* delegate,
                                               const gfx::Rect& bounds) {
     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;
   }
 
   aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
     return CreatePanelWindowWithDelegate(nullptr, bounds);
   }
 
   aura::Window* GetPanelContainer(aura::Window* panel) {
     return Shell::GetContainer(panel->GetRootWindow(),
@@ skipping 108 matching lines @@
     return widget->IsVisible();
   }
 
   test::ShelfViewTestAPI* shelf_view_test() { return shelf_view_test_.get(); }
 
   // Clicks the shelf item on |shelf_view| associated with the given |window|.
   void ClickShelfItemForWindow(ShelfView* shelf_view, aura::Window* window) {
     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();
     event_generator.MoveMouseTo(bounds.CenterPoint());
     event_generator.ClickLeftButton();
 
     test_api.RunMessageLoopUntilAnimationsDone();
   }
 
   WmShelf* GetShelfForWindow(aura::Window* window) {
@@ skipping 693 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash