Refactored code for timezone settings.

chrome/browser/ui/webui/options2/browser_options_handler.cc

Index: chrome/browser/ui/webui/options2/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc
index e4f6339001e4892f9dd2c6f5df9a311ddffdde11..0b6bbc20db940e7fdb78561069bbe5ebfaffabbc 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.cc
@@ -83,11 +83,10 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
-#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
-#include "chrome/browser/chromeos/system_settings_provider.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/webui/options2/chromeos/timezone_options_util.h"
 #include "ui/gfx/image/image_skia.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ -385,10 +384,7 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
 
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
-  values->Set("timezoneList",
-      static_cast<chromeos::SystemSettingsProvider*>(
-          chromeos::CrosSettings::Get()->GetProvider(
-              chromeos::kSystemTimezone))->GetTimezoneList());
+  values->Set("timezoneList", GetTimezoneList());
 #endif
 #if defined(OS_MACOSX)
   values->SetString("macPasswordsWarning",