Revert r150536 - "Added a timezone policy and pyauto tests for it."

chrome/browser/automation/testing_automation_provider_chromeos.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/automation/testing_automation_provider.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/command_line.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
-#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_cache_base.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ skipping 1260 matching lines @@
                                             DictionaryValue* args,
                                             IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   base::Time time(base::Time::Now());
   bool use_24hour_clock = browser && browser->profile()->GetPrefs()->GetBoolean(
       prefs::kUse24HourClock);
   base::HourClockType hour_clock_type =
       use_24hour_clock ? base::k24HourClock : base::k12HourClock;
   string16 display_time = base::TimeFormatTimeOfDayWithHourClockType(
       time, hour_clock_type, base::kDropAmPm);
-  string16 timezone =
-      chromeos::system::TimezoneSettings::GetInstance()->GetCurrentTimezoneID();
+  icu::UnicodeString unicode;
+  chromeos::system::TimezoneSettings::GetInstance()->GetTimezone().getID(
+      unicode);
+  std::string timezone;
+  UTF16ToUTF8(unicode.getBuffer(), unicode.length(), &timezone);
   return_value->SetString("display_time", display_time);
   return_value->SetString("display_date", base::TimeFormatFriendlyDate(time));
   return_value->SetString("timezone", timezone);
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::GetTimeInfo(DictionaryValue* args,
                                             IPC::Message* reply_message) {
   GetTimeInfo(NULL, args, reply_message);
 }
 
 void TestingAutomationProvider::SetTimezone(DictionaryValue* args,
                                             IPC::Message* reply_message) {
-  AutomationJSONReply reply(this, reply_message);
   std::string timezone_id;
   if (!args->GetString("timezone", &timezone_id)) {
-    reply.SendError("Invalid or missing args.");
+    AutomationJSONReply(this, reply_message).SendError(
+        "Invalid or missing args.");
     return;
   }
-  chromeos::CrosSettings* settings = chromeos::CrosSettings::Get();
-  settings->SetString(chromeos::kSystemTimezone, timezone_id);
-  reply.SendSuccess(NULL);
+
+  icu::TimeZone* timezone =
+      icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(timezone_id));
+  chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
+  delete timezone;
+  AutomationJSONReply(this, reply_message).SendSuccess(NULL);
 }
 
 void TestingAutomationProvider::GetUpdateInfo(DictionaryValue* args,
                                               IPC::Message* reply_message) {
   AutomationJSONReply* reply = new AutomationJSONReply(this, reply_message);
   DBusThreadManager::Get()->GetUpdateEngineClient()
       ->GetReleaseTrack(base::Bind(GetReleaseTrackCallback, reply));
 }
 
 void TestingAutomationProvider::UpdateCheck(
@@ skipping 59 matching lines @@
   chromeos::AudioHandler* audio_handler = chromeos::AudioHandler::GetInstance();
   if (!audio_handler) {
     reply.SendError("AudioHandler not initialized.");
     return;
   }
   audio_handler->SetMuted(mute);
   reply.SendSuccess(NULL);
 }
 
 void TestingAutomationProvider::OpenCrosh(DictionaryValue* args,
-                                          IPC::Message* reply_message) {
+                                        IPC::Message* reply_message) {
   new NavigationNotificationObserver(
       NULL, this, reply_message, 1, false, true);
   ash::Shell::GetInstance()->delegate()->OpenCrosh();
 }
 
 void TestingAutomationProvider::CaptureProfilePhoto(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   chromeos::TakePhotoDialog* take_photo_dialog =
@@ skipping 14 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(power_manager_observer_);
 }
 
 void TestingAutomationProvider::RemoveChromeosObservers() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(power_manager_observer_);
   delete power_manager_observer_;
   power_manager_observer_ = NULL;
 }