mash: Serialize ShelfIDs for property conversion and transport.

ash/wm/overview/window_selector_unittest.cc

 // Copyright 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 <algorithm>
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/accessibility_types.h"
 #include "ash/drag_drop/drag_drop_controller.h"
@@ skipping 130 matching lines @@
     window->aura_window()->SetProperty(aura::client::kTopViewInset,
                                        kHeaderHeight);
     ParentWindowInPrimaryRootWindow(widget->GetNativeWindow());
     return widget;
   }
 
   aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
     aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         nullptr, 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]

Is ash:: needed?

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

Done.

+    window->SetProperty(kShelfIDKey, new std::string(shelf_id));
     window->SetProperty(aura::client::kTopViewInset, kHeaderHeight);
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
   bool WindowsOverlapping(aura::Window* window1, aura::Window* window2) {
     gfx::Rect window1_bounds = GetTransformedTargetBounds(window1);
     gfx::Rect window2_bounds = GetTransformedTargetBounds(window2);
     return window1_bounds.Intersects(window2_bounds);
   }
@@ skipping 1694 matching lines @@
                           aura::client::WINDOW_MOVE_SOURCE_MOUSE));
   ASSERT_TRUE(resizer.get());
   gfx::Point location = resizer->GetInitialLocation();
   location.Offset(20, 20);
   resizer->Drag(location, 0);
   ToggleOverview();
   resizer->RevertDrag();
 }
 
 }  // namespace ash