Bug 1035125 Part 7: Remove unused functions in security/sandbox/chromium/base/time/time.h to avoid nspr dependency. r=aklotz

MozReview-Commit-ID: 4TwVMQGTXUU

--HG--
extra : rebase_source : 0757390f3ff6fc71242ae09d95e1934d3e80fa26

security/sandbox/chromium/base/time/time.cc

@@ -216,6 +216,7 @@ Time Time::LocalMidnight() const {
   return FromLocalExploded(exploded);
 }
 
+#if !defined(MOZ_SANDBOX)
 // static
 bool Time::FromStringInternal(const char* time_string,
                               bool is_local,
@@ -236,6 +237,7 @@ bool Time::FromStringInternal(const char* time_string,
   *parsed_time = Time(result_time);
   return true;
 }
+#endif
 
 std::ostream& operator<<(std::ostream& os, Time time) {
   Time::Exploded exploded;

security/sandbox/chromium/base/time/time.h

@@ -388,6 +388,7 @@ class BASE_EXPORT Time {
     return Time(us);
   }
 
+#if !defined(MOZ_SANDBOX)
   // Converts a string representation of time to a Time object.
   // An example of a time string which is converted is as below:-
   // "Tue, 15 Nov 1994 12:45:26 GMT". If the timezone is not specified
@@ -402,6 +403,7 @@ class BASE_EXPORT Time {
   static bool FromUTCString(const char* time_string, Time* parsed_time) {
     return FromStringInternal(time_string, false, parsed_time);
   }
+#endif
 
   // For serializing, use FromInternalValue to reconstitute. Please don't use
   // this and do arithmetic on it, as it is more error prone than using the
@@ -485,6 +487,7 @@ class BASE_EXPORT Time {
   // |is_local = true| or UTC |is_local = false|.
   static Time FromExploded(bool is_local, const Exploded& exploded);
 
+#if !defined(MOZ_SANDBOX)
   // Converts a string representation of time to a Time object.
   // An example of a time string which is converted is as below:-
   // "Tue, 15 Nov 1994 12:45:26 GMT". If the timezone is not specified
@@ -495,6 +498,7 @@ class BASE_EXPORT Time {
   static bool FromStringInternal(const char* time_string,
                                  bool is_local,
                                  Time* parsed_time);
+#endif
 
   // Time in microseconds in UTC.
   int64 us_;

security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt

@@ -6,4 +6,5 @@ https://hg.mozilla.org/mozilla-central/rev/421446ab2347
 https://hg.mozilla.org/mozilla-central/rev/beb74056ac2d
 https://hg.mozilla.org/mozilla-central/rev/7df8d6639971
 https://hg.mozilla.org/mozilla-central/rev/1178c11561bc
-https://bugzilla.mozilla.org/show_bug.cgi?id=1173371 bug1173371part2.patch
+https://hg.mozilla.org/mozilla-central/rev/afa4f68de47c
+https://bugzilla.mozilla.org/show_bug.cgi?id=1035125 bug1035125part7.patch