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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2106663004: arc: Initial implemetation of Chrome sync for Arc packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. More refactor. Fix unit_test related to refactor. Created 4 years, 5 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
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/ui/ash/launcher/chrome_launcher_controller_impl.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after
1812 item_controller->Close(); 1812 item_controller->Close();
1813 base::RunLoop().RunUntilIdle(); 1813 base::RunLoop().RunUntilIdle();
1814 1814
1815 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id1)); 1815 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id1));
1816 EXPECT_EQ(shelf_id_app_2, 1816 EXPECT_EQ(shelf_id_app_2,
1817 launcher_controller_->GetShelfIDForAppID(arc_app_id2)); 1817 launcher_controller_->GetShelfIDForAppID(arc_app_id2));
1818 EXPECT_EQ(shelf_id_app_3, 1818 EXPECT_EQ(shelf_id_app_3,
1819 launcher_controller_->GetShelfIDForAppID(arc_app_id3)); 1819 launcher_controller_->GetShelfIDForAppID(arc_app_id3));
1820 1820
1821 arc_test_.bridge_service()->SetReady(); 1821 arc_test_.bridge_service()->SetReady();
1822 arc_test_.ResetAppInstance();
1822 SendListOfArcApps(); 1823 SendListOfArcApps();
1823 1824
1824 base::RunLoop().RunUntilIdle(); 1825 base::RunLoop().RunUntilIdle();
1825 1826
1826 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id1)); 1827 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id1));
1827 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id2)); 1828 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id2));
1828 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id3)); 1829 EXPECT_EQ(0, launcher_controller_->GetShelfIDForAppID(arc_app_id3));
1829 1830
1830 ASSERT_EQ(2U, arc_test_.app_instance()->launch_requests().size()); 1831 ASSERT_EQ(2U, arc_test_.app_instance()->launch_requests().size());
1831 1832
(...skipping 1866 matching lines...) Expand 10 before | Expand all | Expand 10 after
3698 EXPECT_FALSE(controller->rotation_locked()); 3699 EXPECT_FALSE(controller->rotation_locked());
3699 EXPECT_EQ(display::Display::ROTATE_0, 3700 EXPECT_EQ(display::Display::ROTATE_0,
3700 display::Screen::GetScreen()->GetPrimaryDisplay().rotation()); 3701 display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
3701 3702
3702 NotifyOnTaskOrientationLockRequested(task_id_current_, 3703 NotifyOnTaskOrientationLockRequested(task_id_current_,
3703 OrientationLock::CURRENT); 3704 OrientationLock::CURRENT);
3704 EXPECT_TRUE(controller->rotation_locked()); 3705 EXPECT_TRUE(controller->rotation_locked());
3705 EXPECT_EQ(display::Display::ROTATE_0, 3706 EXPECT_EQ(display::Display::ROTATE_0,
3706 display::Screen::GetScreen()->GetPrimaryDisplay().rotation()); 3707 display::Screen::GetScreen()->GetPrimaryDisplay().rotation());
3707 } 3708 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698