Remove BrowserDistribution::SHORTCUT_APP_LAUNCHER

chrome/browser/shell_integration_win_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 "chrome/browser/shell_integration_win.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 40 matching lines @@
     base::CreateTemporaryFileInDir(temp_dir_.path(), &chrome_exe_);
 
     chrome_app_id_ =
         ShellUtil::GetBrowserModelId(BrowserDistribution::GetDistribution(),
                                      true);
 
     base::FilePath default_user_data_dir;
     chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
     base::FilePath default_profile_path =
         default_user_data_dir.AppendASCII(chrome::kInitialProfile);
-    app_list_app_id_ = GetAppListAppModelIdForProfile(default_profile_path);
     non_default_user_data_dir_ = base::FilePath(FILE_PATH_LITERAL("root"))
         .Append(FILE_PATH_LITERAL("Non Default Data Dir"));
     non_default_profile_ = L"NonDefault";
     non_default_profile_chrome_app_id_ = GetChromiumModelIdForProfile(
         default_user_data_dir.Append(non_default_profile_));
     non_default_user_data_dir_chrome_app_id_ = GetChromiumModelIdForProfile(
         non_default_user_data_dir_.AppendASCII(chrome::kInitialProfile));
     non_default_user_data_dir_and_profile_chrome_app_id_ =
         GetChromiumModelIdForProfile(
             non_default_user_data_dir_.Append(non_default_profile_));
@@ skipping 166 matching lines @@
   // Chrome's AppUserModelId for the non-default profile.
   base::string16 non_default_profile_chrome_app_id_;
 
   // Chrome's AppUserModelId for the non-default user data dir.
   base::string16 non_default_user_data_dir_chrome_app_id_;
 
   // Chrome's AppUserModelId for the non-default user data dir and non-default
   // profile.
   base::string16 non_default_user_data_dir_and_profile_chrome_app_id_;
 
-  // The app launcher's app id.
-  base::string16 app_list_app_id_;
-
   // An example extension id of an example app.
   base::string16 extension_id_;
 
   // The app id of the example app for the default profile and user data dir.
   base::string16 extension_app_id_;
 
   // The app id of the example app for the non-default profile.
   base::string16 non_default_profile_extension_app_id_;
 
  private:
@@ skipping 53 matching lines @@
 
   // Non-default profile path should get chrome::kBrowserAppID joined with
   // profile info.
   base::FilePath profile_path(FILE_PATH_LITERAL("root"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("udd"));
   profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test"));
   EXPECT_EQ(base_app_id + L".udd.UserDataTest",
             GetAppModelIdForProfile(base_app_id, profile_path));
 }
 
-TEST(ShellIntegrationWinTest, GetAppListAppModelIdForProfileTest) {
-  base::string16 base_app_id(
-      BrowserDistribution::GetDistribution()->GetBaseAppId());
-  base_app_id.append(L"AppList");
-
-  // Empty profile path should get chrome::kBrowserAppID + AppList
-  base::FilePath empty_path;
-  EXPECT_EQ(base_app_id, GetAppListAppModelIdForProfile(empty_path));
-
-  // Default profile path should get chrome::kBrowserAppID + AppList
-  base::FilePath default_user_data_dir;
-  chrome::GetDefaultUserDataDirectory(&default_user_data_dir);
-  base::FilePath default_profile_path =
-      default_user_data_dir.AppendASCII(chrome::kInitialProfile);
-  EXPECT_EQ(base_app_id, GetAppListAppModelIdForProfile(default_profile_path));
-
-  // Non-default profile path should get chrome::kBrowserAppID + AppList joined
-  // with profile info.
-  base::FilePath profile_path(FILE_PATH_LITERAL("root"));
-  profile_path = profile_path.Append(FILE_PATH_LITERAL("udd"));
-  profile_path = profile_path.Append(FILE_PATH_LITERAL("User Data - Test"));
-  EXPECT_EQ(base_app_id + L".udd.UserDataTest",
-            GetAppListAppModelIdForProfile(profile_path));
-}
-
 }  // namespace win
 }  // namespace shell_integration