| Index: views/controls/progress_bar_unittest.cc
|
| diff --git a/views/controls/progress_bar_unittest.cc b/views/controls/progress_bar_unittest.cc
|
| index c7fc4df04e6f749ff2c12e0909df55194ba556d8..16f1581e0ead9a8b5f933b5abdabd9b8f3d13213 100644
|
| --- a/views/controls/progress_bar_unittest.cc
|
| +++ b/views/controls/progress_bar_unittest.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -10,30 +10,6 @@
|
|
|
| namespace views {
|
|
|
| -TEST(ProgressBarTest, ProgressProperty) {
|
| - ProgressBar bar;
|
| - bar.SetProgress(-1);
|
| - int progress = bar.GetProgress();
|
| - EXPECT_EQ(0, progress);
|
| - bar.SetProgress(300);
|
| - progress = bar.GetProgress();
|
| - EXPECT_EQ(100, progress);
|
| - bar.SetProgress(62);
|
| - progress = bar.GetProgress();
|
| - EXPECT_EQ(62, progress);
|
| -}
|
| -
|
| -TEST(ProgressBarTest, AddProgressMethod) {
|
| - ProgressBar bar;
|
| - bar.SetProgress(10);
|
| - bar.AddProgress(22);
|
| - int progress = bar.GetProgress();
|
| - EXPECT_EQ(32, progress);
|
| - bar.AddProgress(200);
|
| - progress = bar.GetProgress();
|
| - EXPECT_EQ(100, progress);
|
| -}
|
| -
|
| TEST(ProgressBarTest, TooltipTextProperty) {
|
| ProgressBar bar;
|
| std::wstring tooltip = L"Some text";
|
| @@ -47,7 +23,7 @@ TEST(ProgressBarTest, TooltipTextProperty) {
|
|
|
| TEST(ProgressBarTest, Accessibility) {
|
| ProgressBar bar;
|
| - bar.SetProgress(62);
|
| + bar.SetValue(62);
|
|
|
| ui::AccessibleViewState state;
|
| bar.GetAccessibleState(&state);
|
|
|