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

Side by Side Diff: chrome/browser/ui/app_list/app_list_controller_browsertest.cc

Issue 2131463002: Purge the App Launcher code from Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Zap mac-specific icon assets 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 app_list::SearchResult* observed_result_; 119 app_list::SearchResult* observed_result_;
120 120
121 private: 121 private:
122 base::string16 item_to_observe_; 122 base::string16 item_to_observe_;
123 app_list::AppListModel::SearchResults* observed_results_list_; 123 app_list::AppListModel::SearchResults* observed_results_list_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(AppListControllerSearchResultsBrowserTest); 125 DISALLOW_COPY_AND_ASSIGN(AppListControllerSearchResultsBrowserTest);
126 }; 126 };
127 127
128
129 // Flaky on Mac. https://crbug.com/415264
130 #if defined(OS_MACOSX)
131 #define MAYBE_UninstallSearchResult DISABLED_UninstallSearchResult
132 #else
133 #define MAYBE_UninstallSearchResult UninstallSearchResult
134 #endif
135 // Test showing search results, and uninstalling one of them while displayed. 128 // Test showing search results, and uninstalling one of them while displayed.
136 IN_PROC_BROWSER_TEST_F(AppListControllerSearchResultsBrowserTest, 129 IN_PROC_BROWSER_TEST_F(AppListControllerSearchResultsBrowserTest,
137 MAYBE_UninstallSearchResult) { 130 UninstallSearchResult) {
138 base::FilePath test_extension_path; 131 base::FilePath test_extension_path;
139 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_extension_path)); 132 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_extension_path));
140 test_extension_path = test_extension_path.AppendASCII("extensions") 133 test_extension_path = test_extension_path.AppendASCII("extensions")
141 .AppendASCII("platform_apps") 134 .AppendASCII("platform_apps")
142 .AppendASCII("minimal"); 135 .AppendASCII("minimal");
143 const extensions::Extension* extension = 136 const extensions::Extension* extension =
144 InstallExtension(test_extension_path, 137 InstallExtension(test_extension_path,
145 1 /* expected_change: new install */); 138 1 /* expected_change: new install */);
146 ASSERT_TRUE(extension); 139 ASSERT_TRUE(extension);
147 140
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 // Test creating the initial app list in guest mode. 191 // Test creating the initial app list in guest mode.
199 IN_PROC_BROWSER_TEST_F(AppListControllerGuestModeBrowserTest, Incognito) { 192 IN_PROC_BROWSER_TEST_F(AppListControllerGuestModeBrowserTest, Incognito) {
200 AppListService* service = AppListService::Get(); 193 AppListService* service = AppListService::Get();
201 EXPECT_TRUE(service->GetCurrentAppListProfile()); 194 EXPECT_TRUE(service->GetCurrentAppListProfile());
202 195
203 service->ShowForProfile(browser()->profile()); 196 service->ShowForProfile(browser()->profile());
204 EXPECT_EQ(browser()->profile(), service->GetCurrentAppListProfile()); 197 EXPECT_EQ(browser()->profile(), service->GetCurrentAppListProfile());
205 } 198 }
206 199
207 #endif // defined(OS_CHROMEOS) 200 #endif // defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698