Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 36 deletions

diff --git a/browser/components/migration/nsWindowsMigrationUtils.h b/browser/components/migration/nsWindowsMigrationUtils.h
deleted file mode 100644
index 0288d93d3..000000000
--- a/browser/components/migration/nsWindowsMigrationUtils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef windowsmigrationutils__h__
-#define windowsmigrationutils__h__
-
-#include "prtime.h"
-
-static
-PRTime WinMigrationFileTimeToPRTime(FILETIME* filetime, bool* isValid)
-{
-  SYSTEMTIME st;
-  *isValid = ::FileTimeToSystemTime(filetime, &st);
-  if (!*isValid) {
-    return 0;
-  }
-  PRExplodedTime prt;
-  prt.tm_year = st.wYear;
-  // SYSTEMTIME's day-of-month parameter is 1-based,
-  // PRExplodedTime's is 0-based.
-  prt.tm_month = st.wMonth - 1;
-  prt.tm_mday = st.wDay;
-  prt.tm_hour = st.wHour;
-  prt.tm_min = st.wMinute;
-  prt.tm_sec = st.wSecond;
-  prt.tm_usec = st.wMilliseconds * 1000;
-  prt.tm_wday = 0;
-  prt.tm_yday = 0;
-  prt.tm_params.tp_gmt_offset = 0;
-  prt.tm_params.tp_dst_offset = 0;
-  return PR_ImplodeTime(&prt);
-}
-
-#endif
-