Separate time variables for 32 and 64 bit systems in policy_browsertest

chrome/browser/policy/policy_browsertest.cc

 // 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.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
@@ skipping 228 matching lines @@
 namespace {
 
 #if defined(OS_CHROMEOS)
 const int kOneHourInMs = 60 * 60 * 1000;
 const int kThreeHoursInMs = 180 * 60 * 1000;
 #endif
 
 const char kURL[] = "http://example.com";
 const char kCookieValue[] = "converted=true";
 // Assigned to Philip J. Fry to fix eventually.
+// TODO(maksims): remove architecture check
+// in the future. https://crbug.com/619828

[pastarmovj, 2016/06/14 15:22:48]

What I meant however was to remove the #ifdef completely in favor of the 32bit
test case for now. Then the todo would be to change this to the year 3000 once
no more 32 bit version is ever built.

+#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
 const char kCookieOptions[] = ";expires=Wed Jan 01 3000 00:00:00 GMT";
+#else
+const char kCookieOptions[] = ";expires=Wed Jan 01 2038 00:00:00 GMT";
+#endif
 
 const base::FilePath::CharType kTestExtensionsDir[] =
     FILE_PATH_LITERAL("extensions");
 const base::FilePath::CharType kGoodCrxName[] = FILE_PATH_LITERAL("good.crx");
 const base::FilePath::CharType kAdBlockCrxName[] =
     FILE_PATH_LITERAL("adblock.crx");
 const base::FilePath::CharType kHostedAppCrxName[] =
     FILE_PATH_LITERAL("hosted_app.crx");
 
 const char kGoodCrxId[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
@@ skipping 3837 matching lines @@
 
   SetEmptyPolicy();
   // Policy not set.
   CheckSystemTimezoneAutomaticDetectionPolicyUnset();
   EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
   EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace policy