OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/app_list/app_list_service_impl.h" | 5 #include "chrome/browser/ui/app_list/app_list_service_impl.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 AppListServiceImplBrowserTest() {} | 46 AppListServiceImplBrowserTest() {} |
47 | 47 |
48 // Overridden from InProcessBrowserTest: | 48 // Overridden from InProcessBrowserTest: |
49 void SetUpOnMainThread() override { | 49 void SetUpOnMainThread() override { |
50 service_ = test::GetAppListServiceImpl(); | 50 service_ = test::GetAppListServiceImpl(); |
51 test_api_.reset(new test::AppListServiceImplTestApi(service_)); | 51 test_api_.reset(new test::AppListServiceImplTestApi(service_)); |
52 } | 52 } |
53 | 53 |
54 protected: | 54 protected: |
55 AppListServiceImpl* service_; | 55 AppListServiceImpl* service_; |
56 scoped_ptr<test::AppListServiceImplTestApi> test_api_; | 56 std::unique_ptr<test::AppListServiceImplTestApi> test_api_; |
57 | 57 |
58 private: | 58 private: |
59 DISALLOW_COPY_AND_ASSIGN(AppListServiceImplBrowserTest); | 59 DISALLOW_COPY_AND_ASSIGN(AppListServiceImplBrowserTest); |
60 }; | 60 }; |
61 | 61 |
62 // Test that showing a loaded profile for the first time is lazy and | 62 // Test that showing a loaded profile for the first time is lazy and |
63 // synchronous. Then tests that showing a second loaded profile without | 63 // synchronous. Then tests that showing a second loaded profile without |
64 // dismissing correctly switches profiles. | 64 // dismissing correctly switches profiles. |
65 // crbug.com/459649 | 65 // crbug.com/459649 |
66 IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest, | 66 IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest, |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 EXPECT_LT(0, num_items); | 178 EXPECT_LT(0, num_items); |
179 | 179 |
180 for (int i = 0; i < num_items; i++) { | 180 for (int i = 0; i < num_items; i++) { |
181 if (menu_model->GetTypeAt(i) == ui::MenuModel::TYPE_SEPARATOR) | 181 if (menu_model->GetTypeAt(i) == ui::MenuModel::TYPE_SEPARATOR) |
182 continue; | 182 continue; |
183 | 183 |
184 base::string16 label = menu_model->GetLabelAt(i); | 184 base::string16 label = menu_model->GetLabelAt(i); |
185 EXPECT_FALSE(label.empty()); | 185 EXPECT_FALSE(label.empty()); |
186 } | 186 } |
187 } | 187 } |
OLD | NEW |