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

Side by Side Diff: ash/display/display_change_observer_chromeos_unittest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months 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
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/display/display_change_observer_chromeos.h" 5 #include "ash/display/display_change_observer_chromeos.h"
6 6
7 #include "ash/display/display_info.h" 7 #include "ash/display/display_info.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/display/chromeos/display_mode.h" 10 #include "ui/display/chromeos/display_mode.h"
11 #include "ui/display/chromeos/output_configurator.h" 11 #include "ui/display/chromeos/output_configurator.h"
12 #include "ui/display/chromeos/test/test_display_snapshot.h" 12 #include "ui/display/chromeos/test/test_display_snapshot.h"
13 13
14 using ui::OutputConfigurator; 14 using ui::OutputConfigurator;
15 15
16 typedef testing::Test DisplayChangeObserverTest; 16 typedef testing::Test DisplayChangeObserverTest;
17 17
18 namespace ash { 18 namespace ash {
19 namespace internal {
20 19
21 TEST_F(DisplayChangeObserverTest, GetDisplayModeList) { 20 TEST_F(DisplayChangeObserverTest, GetDisplayModeList) {
22 ScopedVector<const ui::DisplayMode> modes; 21 ScopedVector<const ui::DisplayMode> modes;
23 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60)); 22 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1200), false, 60));
24 23
25 // All non-interlaced (as would be seen with different refresh rates). 24 // All non-interlaced (as would be seen with different refresh rates).
26 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 80)); 25 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 80));
27 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 70)); 26 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 70));
28 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60)); 27 modes.push_back(new ui::DisplayMode(gfx::Size(1920, 1080), false, 60));
29 28
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 EXPECT_EQ(display_modes[5].refresh_rate, 60); 75 EXPECT_EQ(display_modes[5].refresh_rate, 60);
77 76
78 // Outputs without any modes shouldn't cause a crash. 77 // Outputs without any modes shouldn't cause a crash.
79 modes.clear(); 78 modes.clear();
80 display_snapshot.set_modes(modes.get()); 79 display_snapshot.set_modes(modes.get());
81 80
82 display_modes = DisplayChangeObserver::GetDisplayModeList(output); 81 display_modes = DisplayChangeObserver::GetDisplayModeList(output);
83 EXPECT_EQ(0u, display_modes.size()); 82 EXPECT_EQ(0u, display_modes.size());
84 } 83 }
85 84
86 } // namespace internal
87 } // namespace ash 85 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_change_observer_chromeos.cc ('k') | ash/display/display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698