Refactored code for timezone settings.

chrome/browser/chromeos/login/base_login_display_host.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 "chrome/browser/chromeos/login/base_login_display_host.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
@@ skipping 19 matching lines @@
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
-#include "unicode/timezone.h"
 
 namespace {
 
 // Whether sign in transitions are enabled.
 const bool kEnableBackgroundAnimation = false;
 const bool kEnableBrowserWindowsOpacityAnimation = true;
 const bool kEnableBrowserWindowsTransformAnimation = true;
 
 // Sign in transition timings.
 static const int kBackgroundTransitionPauseMs = 100;
@@ skipping 495 matching lines @@
   chromeos::LoginUtils::Get()->PrewarmAuthentication();
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()
       ->EmitLoginPromptReady();
 
   // Set initial timezone if specified by customization.
   const std::string timezone_name = startup_manifest->initial_timezone();
   VLOG(1) << "Initial time zone: " << timezone_name;
   // Apply locale customizations only once to preserve whatever locale
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
-    icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
-        icu::UnicodeString::fromUTF8(timezone_name));
-    CHECK(timezone) << "Timezone could not be set for " << timezone_name;
-    chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
+    chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
+        UTF8ToUTF16(timezone_name));
   }
 }
 
 }  // namespace chromeos