mash: Replace int ShelfIDs with AppLaunchID strings.

ash/mus_property_mirror_ash_unittest.cc

 // Copyright 2017 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/public/cpp/mus_property_mirror_ash.h"
 
 #include <string>
 
 #include "ash/public/cpp/window_properties.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 28 matching lines @@
       window_1.get(), window_2.get(), aura::client::kDrawAttentionKey);
   EXPECT_TRUE(window_2->GetProperty(aura::client::kDrawAttentionKey));
 }
 
 // Ensure the property mirror can copy owned object properties between windows.
 TEST_F(MusPropertyMirrorAshTest, OwnedProperties) {
   MusPropertyMirrorAsh mus_property_mirror_ash;
   std::unique_ptr<aura::Window> window_1(CreateTestWindow());
   std::unique_ptr<aura::Window> window_2(CreateTestWindow());
 
-  EXPECT_EQ(nullptr, window_1->GetProperty(aura::client::kAppIdKey));
-  EXPECT_EQ(nullptr, window_2->GetProperty(aura::client::kAppIdKey));
-  window_1->SetProperty(aura::client::kAppIdKey, new std::string("abc"));
-  EXPECT_EQ("abc", *window_1->GetProperty(aura::client::kAppIdKey));
-  mus_property_mirror_ash.MirrorPropertyFromWidgetWindowToRootWindow(
-      window_1.get(), window_2.get(), aura::client::kAppIdKey);
-  EXPECT_EQ("abc", *window_2->GetProperty(aura::client::kAppIdKey));
-  EXPECT_NE(window_1->GetProperty(aura::client::kAppIdKey),
-            window_2->GetProperty(aura::client::kAppIdKey));
-
   EXPECT_EQ(nullptr, window_1->GetProperty(aura::client::kTitleKey));
   EXPECT_EQ(nullptr, window_2->GetProperty(aura::client::kTitleKey));
   window_1->SetProperty(aura::client::kTitleKey,
-                        new base::string16(base::ASCIIToUTF16("def")));
-  EXPECT_EQ(base::ASCIIToUTF16("def"),
+                        new base::string16(base::ASCIIToUTF16("abc")));
+  EXPECT_EQ(base::ASCIIToUTF16("abc"),
             *window_1->GetProperty(aura::client::kTitleKey));
   mus_property_mirror_ash.MirrorPropertyFromWidgetWindowToRootWindow(
       window_1.get(), window_2.get(), aura::client::kTitleKey);
-  EXPECT_EQ(base::ASCIIToUTF16("def"),
+  EXPECT_EQ(base::ASCIIToUTF16("abc"),
             *window_2->GetProperty(aura::client::kTitleKey));
   EXPECT_NE(window_1->GetProperty(aura::client::kTitleKey),
             window_2->GetProperty(aura::client::kTitleKey));
 
   window_1->ClearProperty(aura::client::kWindowIconKey);
   EXPECT_EQ(nullptr, window_1->GetProperty(aura::client::kWindowIconKey));
   window_2->ClearProperty(aura::client::kWindowIconKey);
   EXPECT_EQ(nullptr, window_2->GetProperty(aura::client::kWindowIconKey));
   window_1->SetProperty(aura::client::kWindowIconKey, new gfx::ImageSkia());
   EXPECT_NE(nullptr, window_1->GetProperty(aura::client::kWindowIconKey));
   mus_property_mirror_ash.MirrorPropertyFromWidgetWindowToRootWindow(
       window_1.get(), window_2.get(), aura::client::kWindowIconKey);
   EXPECT_NE(nullptr, window_2->GetProperty(aura::client::kWindowIconKey));
   EXPECT_NE(window_1->GetProperty(aura::client::kWindowIconKey),
             window_2->GetProperty(aura::client::kWindowIconKey));
 }
 
 }  // namespace ash