clang/win: Fix a Wenum-compare warning and a few Wwritable-strings warnings.

BUG=82385
R=rnk@chromium.org
TBR=jochen

Review URL: https://codereview.chromium.org/405123002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284447 0039d316-1c4b-4281-b951-d872f2087c98

base/time/time_win_unittest.cc

@@ -178,7 +178,7 @@ TEST(TimeTicks, TimerPerformance) {
   typedef TimeTicks (*TestFunc)();
   struct TestCase {
     TestFunc func;
-    char *description;
+    const char *description;
   };
   // Cheating a bit here:  assumes sizeof(TimeTicks) == sizeof(Time)
   // in order to create a single test case list.

content/shell/browser/shell_web_contents_view_delegate_win.cc

@@ -38,7 +38,7 @@ enum {
 
 void MakeContextMenuItem(HMENU menu,
                          int menu_index,
-                         LPTSTR text,
+                         LPCTSTR text,
                          UINT id,
                          bool enabled) {
   MENUITEMINFO mii = {0};
@@ -47,7 +47,7 @@ void MakeContextMenuItem(HMENU menu,
   mii.fState = enabled ? MFS_ENABLED : (MF_DISABLED | MFS_GRAYED);
   mii.fType = MFT_STRING;
   mii.wID = id;
-  mii.dwTypeData = text;
+  mii.dwTypeData = const_cast<LPTSTR>(text);
 
   InsertMenuItem(menu, menu_index, TRUE, &mii);
 }

rlz/win/lib/process_info.cc

@@ -172,7 +172,7 @@ bool ProcessInfo::HasAdminRights() {
       if (SUCCEEDED(GetElevationType(&elevation)) &&
         base::GetProcessIntegrityLevel(base::GetCurrentProcessHandle(), &level))
         has_rights = (elevation == TokenElevationTypeFull) ||
-                    (level == HIGH_INTEGRITY);
+                     (level == base::HIGH_INTEGRITY);
     } else {
       long group = 0;
       if (GetUserGroup(&group))

rlz/win/lib/process_info.h

@@ -13,13 +13,6 @@ namespace rlz_lib {
 
 class ProcessInfo {
  public:
-  enum IntegrityLevel {
-    INTEGRITY_UNKNOWN,
-    LOW_INTEGRITY,
-    MEDIUM_INTEGRITY,
-    HIGH_INTEGRITY,
-  };
-
   // All these functions cache the result after first run.
   static bool IsRunningAsSystem();
   static bool HasAdminRights();  // System / Admin / High Elevation on Vista