Revert of Uniquify profile shortcut name.

chrome/browser/profiles/profile_shortcut_manager_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_
 
-#include <set>
-
 #include "base/callback.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class BrowserDistribution;
 
 // Internal free-standing functions that are exported here for testing.
 namespace profiles {
 namespace internal {
 
 // Returns the full path to the profile icon file.
 base::FilePath GetProfileIconPath(const base::FilePath& profile_path);
 
 // Returns the default shortcut filename for the given profile name,
 // given |distribution|. Returns a filename appropriate for a
 // single-user installation if |profile_name| is empty.
 base::string16 GetShortcutFilenameForProfile(const base::string16& profile_name,
                                              BrowserDistribution* distribution);
 
-// The same as GetShortcutFilenameForProfile but uniqueness is guaranteed.
-// Makes an unique filename among |excludes|.
-base::string16 GetUniqueShortcutFilenameForProfile(
-    const base::string16& profile_name,
-    const std::set<base::FilePath>& excludes,
-    BrowserDistribution* distribution);
-
-// This class checks that shortcut filename matches certain profile.
-class ShortcutFilenameMatcher {
- public:
-  ShortcutFilenameMatcher(const base::string16& profile_name,
-                          BrowserDistribution* distribution);
-
-  // Check that shortcut filename has a name given by us (by
-  // GetShortcutFilenameForProfile or GetUniqueShortcutFilenameForProfile).
-  bool IsCanonical(const base::string16& filename) const;
-
- private:
-  const base::string16 profile_shortcut_filename_;
-  const base::StringPiece16 lnk_ext_;
-  base::StringPiece16 profile_shortcut_name_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShortcutFilenameMatcher);
-};
-
 // Returns the command-line flags to launch Chrome with the given profile.
 base::string16 CreateProfileShortcutFlags(const base::FilePath& profile_path);
 
 }  // namespace internal
 }  // namespace profiles
 
 class ProfileShortcutManagerWin : public ProfileShortcutManager,
                                   public ProfileInfoCacheObserver,
                                   public content::NotificationObserver {
  public:
@@ skipping 52 matching lines @@
       NonProfileShortcutAction action);
 
   ProfileManager* profile_manager_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileShortcutManagerWin);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_SHORTCUT_MANAGER_WIN_H_