Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Side by Side Diff: chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

Issue 8591003: aura: Fix Chrome OS status area browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename to GetStatusAreaForTest() and remove const-ness Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/status/clock_menu_button.h" 5 #include "chrome/browser/chromeos/status/clock_menu_button.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/chromeos/cros/cros_library.h" 8 #include "chrome/browser/chromeos/cros/cros_library.h"
9 #include "chrome/browser/chromeos/frame/browser_view.h" 9 #include "chrome/browser/chromeos/frame/browser_view.h"
10 #include "chrome/browser/chromeos/system/timezone_settings.h" 10 #include "chrome/browser/chromeos/system/timezone_settings.h"
(...skipping 16 matching lines...) Expand all
27 protected: 27 protected:
28 ClockMenuButtonTest() : InProcessBrowserTest() {} 28 ClockMenuButtonTest() : InProcessBrowserTest() {}
29 virtual void SetUpInProcessBrowserTestFixture() { 29 virtual void SetUpInProcessBrowserTestFixture() {
30 // This test requires actual libcros, but InProcessBrowserTest has set 30 // This test requires actual libcros, but InProcessBrowserTest has set
31 // to use stub, so reset it here. 31 // to use stub, so reset it here.
32 CrosLibrary::Get()->GetTestApi()->ResetUseStubImpl(); 32 CrosLibrary::Get()->GetTestApi()->ResetUseStubImpl();
33 } 33 }
34 const ClockMenuButton* GetClockMenuButton() { 34 const ClockMenuButton* GetClockMenuButton() {
35 const views::View* parent = NULL; 35 const views::View* parent = NULL;
36 #if defined(USE_AURA) 36 #if defined(USE_AURA)
37 parent = ChromeShellDelegate::instance()->GetStatusArea(); 37 parent = ChromeShellDelegate::instance()->GetStatusAreaForTest();
38 #else 38 #else
39 parent = static_cast<const BrowserView*>(browser()->window()); 39 parent = static_cast<const BrowserView*>(browser()->window());
40 #endif 40 #endif
41 return static_cast<const ClockMenuButton*>(parent->GetViewByID( 41 return static_cast<const ClockMenuButton*>(
42 VIEW_ID_STATUS_BUTTON_CLOCK)); 42 parent->GetViewByID(VIEW_ID_STATUS_BUTTON_CLOCK));
43 } 43 }
44 }; 44 };
45 45
46 IN_PROC_BROWSER_TEST_F(ClockMenuButtonTest, TimezoneTest) { 46 IN_PROC_BROWSER_TEST_F(ClockMenuButtonTest, TimezoneTest) {
47 const ClockMenuButton* clock = GetClockMenuButton(); 47 const ClockMenuButton* clock = GetClockMenuButton();
48 ASSERT_TRUE(clock != NULL); 48 ASSERT_TRUE(clock != NULL);
49 49
50 // Update timezone and make sure clock text changes. 50 // Update timezone and make sure clock text changes.
51 scoped_ptr<icu::TimeZone> timezone_first(icu::TimeZone::createTimeZone( 51 scoped_ptr<icu::TimeZone> timezone_first(icu::TimeZone::createTimeZone(
52 icu::UnicodeString::fromUTF8("Asia/Hong_Kong"))); 52 icu::UnicodeString::fromUTF8("Asia/Hong_Kong")));
53 system::TimezoneSettings::GetInstance()->SetTimezone(*timezone_first); 53 system::TimezoneSettings::GetInstance()->SetTimezone(*timezone_first);
54 string16 text_before = clock->text(); 54 string16 text_before = clock->text();
55 scoped_ptr<icu::TimeZone> timezone_second(icu::TimeZone::createTimeZone( 55 scoped_ptr<icu::TimeZone> timezone_second(icu::TimeZone::createTimeZone(
56 icu::UnicodeString::fromUTF8("Pacific/Samoa"))); 56 icu::UnicodeString::fromUTF8("Pacific/Samoa")));
57 system::TimezoneSettings::GetInstance()->SetTimezone(*timezone_second); 57 system::TimezoneSettings::GetInstance()->SetTimezone(*timezone_second);
58 string16 text_after = clock->text(); 58 string16 text_after = clock->text();
59 EXPECT_NE(text_before, text_after); 59 EXPECT_NE(text_before, text_after);
60 } 60 }
61 61
62 } // namespace chromeos 62 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698