Sharing shell_util_unittest code to verify shortcuts

chrome/installer/util/shell_util.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.
 //
 // This file declares methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
@@ skipping 17 matching lines @@
 // This is a utility class that provides common shell integration methods
 // that can be used by installer as well as Chrome.
 class ShellUtil {
  public:
   // Input to any methods that make changes to OS shell.
   enum ShellChange {
     CURRENT_USER = 0x1,  // Make any shell changes only at the user level
     SYSTEM_LEVEL = 0x2   // Make any shell changes only at the system level
   };
 
+  enum VerifyShortcuts {

[gab, 2012/08/09 19:25:57]

nit: Rename this to VerifyShortcutStatus to be more explicit about this type.

[Halli, 2012/08/09 20:49:59]

Done.

+    VERIFY_SHORTCUT_SUCCESS,

[gab, 2012/08/09 19:25:57]

nit: Set this first enum to 0 explicitly as per chromium-style (e.g. as in
shell_util.cc:55)

[Halli, 2012/08/09 20:49:59]

Done.

+    VERIFY_SHORTCUT_FAILURE_UNEXPECTED,
+    VERIFY_SHORTCUT_FAILURE_PATH,
+    VERIFY_SHORTCUT_FAILURE_DESCRIPTION,
+    VERIFY_SHORTCUT_FAILURE_ICON_INDEX
+  };
+
   // Relative path of the URL Protocol registry entry (prefixed with '\').
   static const wchar_t* kRegURLProtocol;
 
   // Relative path of DefaultIcon registry entry (prefixed with '\').
   static const wchar_t* kRegDefaultIcon;
 
   // Relative path of "shell" registry key.
   static const wchar_t* kRegShellPath;
 
   // Relative path of shell open command in Windows registry
@@ skipping 357 matching lines @@
   // does not exist, this method is a no-op and returns false.
   static bool UpdateChromeShortcut(BrowserDistribution* dist,
                                    const string16& chrome_exe,
                                    const string16& shortcut,
                                    const string16& arguments,
                                    const string16& description,
                                    const string16& icon_path,
                                    int icon_index,
                                    uint32 options);
 
+  // Verify that a shortcut exists with the expected information.
+  // |exe_path| The shortcut's exe.
+  // |shortcut| The path to shortcut.

[gab, 2012/08/09 19:25:57]

+"the" after "to"

[Halli, 2012/08/09 20:49:59]

Done.

+  // |description| The shortcut's description.
+  // |icon_index| The icon's index in the exe.
+  static VerifyShortcuts VerifyChromeShortcut(const string16& exe_path,
+                                              const string16& shortcut,
+                                              const string16& description,
+                                              int icon_index);
+
   // Sets |suffix| to the base 32 encoding of the md5 hash of this user's sid
   // preceded by a dot.
   // This is guaranteed to be unique on the machine and 27 characters long
   // (including the '.').
   // This suffix is then meant to be added to all registration that may conflict
   // with another user-level Chrome install.
   // Note that prior to Chrome 21, the suffix registered used to be the user's
   // username (see GetOldUserSpecificRegistrySuffix() below). We still honor old
   // installs registered that way, but it was wrong because some of the
   // characters allowed in a username are not allowed in a ProgId.
@@ skipping 16 matching lines @@
   // required by the base32 standard for inputs that aren't a multiple of 5
   // bytes.
   static string16 ByteArrayToBase32(const uint8* bytes, size_t size);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_