Fixed flakyness of ClockMenuButtonTest.TimezoneTest....

chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

 // Copyright (c) 2010 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/status/clock_menu_button.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 17 matching lines @@
   ClockMenuButton* GetClockMenuButton() {
     BrowserView* view = static_cast<BrowserView*>(browser()->window());
     return static_cast<StatusAreaView*>(view->
         GetViewByID(VIEW_ID_STATUS_AREA))->clock_view();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ClockMenuButtonTest, TimezoneTest) {
   ClockMenuButton* clock = GetClockMenuButton();
   ASSERT_TRUE(clock != NULL);
+
   // Update timezone and make sure clock text changes.
+  scoped_ptr<icu::TimeZone> timezone_first(icu::TimeZone::createTimeZone(
+      icu::UnicodeString::fromUTF8("Asia/Hong_Kong")));
+  CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone_first.get());
   std::wstring text_before = clock->text();
-  scoped_ptr<icu::TimeZone> timezone(icu::TimeZone::createTimeZone(
-      icu::UnicodeString::fromUTF8("Asia/Hong_Kong")));
-  CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone.get());
+  scoped_ptr<icu::TimeZone> timezone_second(icu::TimeZone::createTimeZone(
+      icu::UnicodeString::fromUTF8("Pacific/Samoa")));
+  CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone_second.get());
   std::wstring text_after = clock->text();
   EXPECT_NE(text_before, text_after);
+
 }
 
 }  // namespace chromeos