mash: Replace int ShelfIDs with AppLaunchID strings.

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"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 49 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++)));
     shelf_view_test()->RunMessageLoopUntilAnimationsDone();
     return window;
   }
 
   aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
-    return CreatePanelWindowWithDelegate(NULL, bounds);
+    return CreatePanelWindowWithDelegate(nullptr, bounds);
   }
 
   aura::Window* GetPanelContainer(aura::Window* panel) {
     return Shell::GetContainer(panel->GetRootWindow(),
                                kShellWindowId_PanelContainer);
   }
 
   views::Widget* GetCalloutWidgetForPanel(aura::Window* panel) {
     WmWindow* wm_panel = WmWindow::Get(panel);
     PanelLayoutManager* manager = PanelLayoutManager::Get(wm_panel);
@@ skipping 97 matching lines @@
     }
   }
 
   bool IsPanelCalloutVisible(aura::Window* panel) {
     views::Widget* widget = GetCalloutWidgetForPanel(panel);
     return widget->IsVisible();
   }
 
   test::ShelfViewTestAPI* shelf_view_test() { return shelf_view_test_.get(); }
 
-  // Clicks the shelf items on |shelf_view| that is associated with given
-  // |window|.
+  // 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();
-    int index = Shell::Get()->shelf_model()->ItemIndexByID(
-        window->GetProperty(kShelfIDKey));
+    ShelfID* shelf_id = window->GetProperty(kShelfIDKey);
+    DCHECK(shelf_id);
+    int index = Shell::Get()->shelf_model()->ItemIndexByID(*shelf_id);
     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