3 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc
index a183792..5880b0b 100644
--- a/chrome/browser/chromeos/status/clock_menu_button.cc
+++ b/chrome/browser/chromeos/status/clock_menu_button.cc
@@ -40,8 +40,8 @@ const int kTimerSlopSeconds = 1;
 
 ClockMenuButton::ClockMenuButton(StatusAreaHost* host)
     : StatusAreaButton(host, this) {
-  // Add as SystemAccess observer. We update the clock if timezone changes.
-  SystemAccess::GetInstance()->AddObserver(this);
+  // Add as TimezoneSettings observer. We update the clock if timezone changes.
+  system::TimezoneSettings::GetInstance()->AddObserver(this);
   CrosLibrary::Get()->GetPowerLibrary()->AddObserver(this);
   // Start monitoring the kUse24HourClock preference.
   if (host->GetProfile()) {  // This can be NULL in the login screen.
@@ -54,7 +54,7 @@ ClockMenuButton::ClockMenuButton(StatusAreaHost* host)
 
 ClockMenuButton::~ClockMenuButton() {
   CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
-  SystemAccess::GetInstance()->RemoveObserver(this);
+  system::TimezoneSettings::GetInstance()->RemoveObserver(this);
 }
 
 void ClockMenuButton::UpdateTextAndSetNextTimer() {
diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h
index ebba360..d6fd4ee 100644
--- a/chrome/browser/chromeos/status/clock_menu_button.h
+++ b/chrome/browser/chromeos/status/clock_menu_button.h
@@ -14,7 +14,7 @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_type.h"
-#include "chrome/browser/chromeos/system_access.h"
+#include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "unicode/calendar.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_delegate.h"
@@ -35,7 +35,7 @@ class ClockMenuButton : public StatusAreaButton,
                         public views::ViewMenuDelegate,
                         public NotificationObserver,
                         public PowerLibrary::Observer,
-                        public SystemAccess::Observer {
+                        public system::TimezoneSettings::Observer {
  public:
   explicit ClockMenuButton(StatusAreaHost* host);
   virtual ~ClockMenuButton();
@@ -49,7 +49,7 @@ class ClockMenuButton : public StatusAreaButton,
   virtual void PowerChanged(PowerLibrary* obj) {}
   virtual void SystemResumed();
 
-  // Overridden from SystemAccess::Observer:
+  // Overridden from TimezoneSettings::Observer:
   virtual void TimezoneChanged(const icu::TimeZone& timezone);
 
   // views::View
diff --git a/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc b/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc
index d913c63..67c77c4 100644
--- a/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/clock_menu_button_browsertest.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/frame/browser_view.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
-#include "chrome/browser/chromeos/system_access.h"
+#include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/browser.h"
@@ -42,11 +42,11 @@ IN_PROC_BROWSER_TEST_F(ClockMenuButtonTest, TimezoneTest) {
   // Update timezone and make sure clock text changes.
   scoped_ptr<icu::TimeZone> timezone_first(icu::TimeZone::createTimeZone(
       icu::UnicodeString::fromUTF8("Asia/Hong_Kong")));
-  SystemAccess::GetInstance()->SetTimezone(*timezone_first);
+  system::TimezoneSettings::GetInstance()->SetTimezone(*timezone_first);
   std::wstring text_before = clock->text();
   scoped_ptr<icu::TimeZone> timezone_second(icu::TimeZone::createTimeZone(
       icu::UnicodeString::fromUTF8("Pacific/Samoa")));
-  SystemAccess::GetInstance()->SetTimezone(*timezone_second);
+  system::TimezoneSettings::GetInstance()->SetTimezone(*timezone_second);
   std::wstring text_after = clock->text();
   EXPECT_NE(text_before, text_after);
 }