Fix Valgrind error in earlier time_formatting_unittest.cc change.

base/i18n/time_formatting_unittest.cc

 // Copyright (c) 2011 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 "base/i18n/time_formatting.h"
 
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/icu/source/common/unicode/uversion.h"
 #include "third_party/icu/source/i18n/unicode/calendar.h"
 #include "third_party/icu/source/i18n/unicode/timezone.h"
 
 namespace base {
 namespace {
 
 const Time::Exploded kTestDateTimeExploded = {
   2011, 4, 6, 30, // Sat, Apr 30, 2011
   15, 42, 7, 0    // 15:42:07.000
 };
 
 base::string16 GetShortTimeZone() {
   scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
-  // This code shamelessly taken from
-  // src/chrome/browser/chromeos/system/timezone_util.cc.
-  int raw_offset, dst_offset;
-  UErrorCode status;
-  zone->getOffset(icu::Calendar::getNow(), false, raw_offset, dst_offset,
-                  status);
   icu::UnicodeString name;
   zone->getDisplayName(true, icu::TimeZone::SHORT, name);
   return base::string16(name.getBuffer(), name.length());
 }
 
 TEST(TimeFormattingTest, TimeFormatTimeOfDayDefault12h) {
   // Test for a locale defaulted to 12h clock.
   // As an instance, we use third_party/icu/source/data/locales/en.txt.
   i18n::SetICUDefaultLocale("en_US");
 
@@ skipping 127 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("30/04/2011 15:42:07 ") + GetShortTimeZone(),
             TimeFormatShortDateAndTimeWithTimeZone(time));
   EXPECT_EQ(ASCIIToUTF16("Saturday, 30 April 2011 15:42:07"),
             TimeFormatFriendlyDateAndTime(time));
   EXPECT_EQ(ASCIIToUTF16("Saturday, 30 April 2011"),
             TimeFormatFriendlyDate(time));
 }
 
 }  // namespace
 }  // namespace base