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

chrome/browser/automation/testing_automation_provider_chromeos.cc

Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
index a5e7dd6412a8653a7f75f926e925c68ac35b57e8..9418f9c68b4004c7eaaf88110adac971a4f747e0 100644
--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
@@ -34,8 +34,6 @@
 #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"
@@ -1316,8 +1314,11 @@ void TestingAutomationProvider::GetTimeInfo(Browser* browser,
       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);
@@ -1331,15 +1332,18 @@ void TestingAutomationProvider::GetTimeInfo(DictionaryValue* args,
 
 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,
@@ -1419,7 +1423,7 @@ void TestingAutomationProvider::SetMute(DictionaryValue* args,
 }
 
 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();