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

Unified Diff: ash/system/chromeos/screen_security/screen_tray_item_unittest.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
diff --git a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
index c4510ded0c32366d0649cd4650ba32d2545f3383..2d192322c67e99a1b82a2a78c4047dc2f1a25f1b 100644
--- a/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
+++ b/ash/system/chromeos/screen_security/screen_tray_item_unittest.cc
@@ -36,8 +36,7 @@ void ClickViewCenter(views::View* view) {
class ScreenTrayItemTest : public ash::test::AshTestBase {
public:
- ScreenTrayItemTest()
- : tray_item_(NULL), stop_callback_hit_count_(0) {}
+ ScreenTrayItemTest() : tray_item_(NULL), stop_callback_hit_count_(0) {}
~ScreenTrayItemTest() override {}
ScreenTrayItem* tray_item() { return tray_item_; }
@@ -55,13 +54,9 @@ class ScreenTrayItemTest : public ash::test::AshTestBase {
base::Bind(&ScreenTrayItemTest::StopCallback, base::Unretained(this)));
}
- void StopSession() {
- tray_item_->Stop();
- }
+ void StopSession() { tray_item_->Stop(); }
- void StopCallback() {
- stop_callback_hit_count_++;
- }
+ void StopCallback() { stop_callback_hit_count_++; }
private:
ScreenTrayItem* tray_item_;
@@ -118,8 +113,12 @@ void TestStartAndStop(ScreenTrayItemTest* test) {
EXPECT_EQ(1, test->stop_callback_hit_count());
}
-TEST_F(ScreenCaptureTest, StartAndStop) { TestStartAndStop(this); }
-TEST_F(ScreenShareTest, StartAndStop) { TestStartAndStop(this); }
+TEST_F(ScreenCaptureTest, StartAndStop) {
+ TestStartAndStop(this);
+}
+TEST_F(ScreenShareTest, StartAndStop) {
+ TestStartAndStop(this);
+}
void TestNotificationStartAndStop(ScreenTrayItemTest* test,
const base::Closure& start_function,
@@ -138,31 +137,29 @@ void TestNotificationStartAndStop(ScreenTrayItemTest* test,
}
TEST_F(ScreenCaptureTest, NotificationStartAndStop) {
- base::Closure start_function =
- base::Bind(&SystemTrayNotifier::NotifyScreenCaptureStart,
- base::Unretained(WmShell::Get()->system_tray_notifier()),
- base::Bind(&ScreenTrayItemTest::StopCallback,
- base::Unretained(this)),
- base::UTF8ToUTF16(kTestScreenCaptureAppName));
+ base::Closure start_function = base::Bind(
+ &SystemTrayNotifier::NotifyScreenCaptureStart,
+ base::Unretained(WmShell::Get()->system_tray_notifier()),
+ base::Bind(&ScreenTrayItemTest::StopCallback, base::Unretained(this)),
+ base::UTF8ToUTF16(kTestScreenCaptureAppName));
base::Closure stop_function =
base::Bind(&SystemTrayNotifier::NotifyScreenCaptureStop,
- base::Unretained(WmShell::Get()->system_tray_notifier()));
+ base::Unretained(WmShell::Get()->system_tray_notifier()));
TestNotificationStartAndStop(this, start_function, stop_function);
}
TEST_F(ScreenShareTest, NotificationStartAndStop) {
- base::Closure start_func =
- base::Bind(&SystemTrayNotifier::NotifyScreenShareStart,
- base::Unretained(WmShell::Get()->system_tray_notifier()),
- base::Bind(&ScreenTrayItemTest::StopCallback,
- base::Unretained(this)),
- base::UTF8ToUTF16(kTestScreenShareHelperName));
+ base::Closure start_func = base::Bind(
+ &SystemTrayNotifier::NotifyScreenShareStart,
+ base::Unretained(WmShell::Get()->system_tray_notifier()),
+ base::Bind(&ScreenTrayItemTest::StopCallback, base::Unretained(this)),
+ base::UTF8ToUTF16(kTestScreenShareHelperName));
base::Closure stop_func =
base::Bind(&SystemTrayNotifier::NotifyScreenShareStop,
- base::Unretained(WmShell::Get()->system_tray_notifier()));
+ base::Unretained(WmShell::Get()->system_tray_notifier()));
TestNotificationStartAndStop(this, start_func, stop_func);
}
@@ -178,8 +175,12 @@ void TestNotificationView(ScreenTrayItemTest* test) {
test->StopSession();
}
-TEST_F(ScreenCaptureTest, NotificationView) { TestNotificationView(this); }
-TEST_F(ScreenShareTest, NotificationView) { TestNotificationView(this); }
+TEST_F(ScreenCaptureTest, NotificationView) {
+ TestNotificationView(this);
+}
+TEST_F(ScreenShareTest, NotificationView) {
+ TestNotificationView(this);
+}
void TestSystemTrayInteraction(ScreenTrayItemTest* test) {
ScreenTrayItem* tray_item = test->tray_item();
« no previous file with comments | « ash/system/chromeos/screen_security/screen_tray_item.cc ('k') | ash/system/chromeos/session/logout_button_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698