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

Side by Side Diff: chrome/browser/media/desktop_media_list_ash_unittest.cc

Issue 684613002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 "chrome/browser/media/desktop_media_list_ash.h" 5 #include "chrome/browser/media/desktop_media_list_ash.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "chrome/browser/media/desktop_media_list_observer.h" 9 #include "chrome/browser/media/desktop_media_list_observer.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 10 matching lines...) Expand all
21 MOCK_METHOD1(OnSourceAdded, void(int index)); 21 MOCK_METHOD1(OnSourceAdded, void(int index));
22 MOCK_METHOD1(OnSourceRemoved, void(int index)); 22 MOCK_METHOD1(OnSourceRemoved, void(int index));
23 MOCK_METHOD2(OnSourceMoved, void(int old_index, int new_index)); 23 MOCK_METHOD2(OnSourceMoved, void(int old_index, int new_index));
24 MOCK_METHOD1(OnSourceNameChanged, void(int index)); 24 MOCK_METHOD1(OnSourceNameChanged, void(int index));
25 MOCK_METHOD1(OnSourceThumbnailChanged, void(int index)); 25 MOCK_METHOD1(OnSourceThumbnailChanged, void(int index));
26 }; 26 };
27 27
28 class DesktopMediaListAshTest : public ash::test::AshTestBase { 28 class DesktopMediaListAshTest : public ash::test::AshTestBase {
29 public: 29 public:
30 DesktopMediaListAshTest() {} 30 DesktopMediaListAshTest() {}
31 virtual ~DesktopMediaListAshTest() {} 31 ~DesktopMediaListAshTest() override {}
32 32
33 void CreateList(int source_types) { 33 void CreateList(int source_types) {
34 list_.reset(new DesktopMediaListAsh(source_types)); 34 list_.reset(new DesktopMediaListAsh(source_types));
35 list_->SetThumbnailSize(gfx::Size(kThumbnailSize, kThumbnailSize)); 35 list_->SetThumbnailSize(gfx::Size(kThumbnailSize, kThumbnailSize));
36 36
37 // Set update period to reduce the time it takes to run tests. 37 // Set update period to reduce the time it takes to run tests.
38 list_->SetUpdatePeriod(base::TimeDelta::FromMilliseconds(1)); 38 list_->SetUpdatePeriod(base::TimeDelta::FromMilliseconds(1));
39 } 39 }
40 40
41 protected: 41 protected:
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 .WillOnce(QuitMessageLoop()) 105 .WillOnce(QuitMessageLoop())
106 .WillRepeatedly(DoDefault()); 106 .WillRepeatedly(DoDefault());
107 EXPECT_CALL(observer_, OnSourceRemoved(0)) 107 EXPECT_CALL(observer_, OnSourceRemoved(0))
108 .WillOnce(QuitMessageLoop()); 108 .WillOnce(QuitMessageLoop());
109 109
110 list_->StartUpdating(&observer_); 110 list_->StartUpdating(&observer_);
111 base::MessageLoop::current()->Run(); 111 base::MessageLoop::current()->Run();
112 window.reset(); 112 window.reset();
113 base::MessageLoop::current()->Run(); 113 base::MessageLoop::current()->Run();
114 } 114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698