| Index: chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| index 77caf7e2616105fb12af7adbf74e5df8cf3958e3..430ef14c6b558bc0de79c596e97074011475cbcd 100644
|
| --- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
|
| @@ -2,6 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "base/command_line.h"
|
| #include "base/path_service.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -16,6 +17,7 @@
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/test/base/in_process_browser_test.h"
|
| #include "ui/app_list/app_list_model.h"
|
| +#include "ui/app_list/app_list_switches.h"
|
| #include "ui/app_list/search_box_model.h"
|
| #include "ui/app_list/search_result.h"
|
| #include "ui/app_list/search_result_observer.h"
|
| @@ -174,6 +176,12 @@ class AppListControllerSearchResultsBrowserTest
|
| // Test showing search results, and uninstalling one of them while displayed.
|
| IN_PROC_BROWSER_TEST_F(AppListControllerSearchResultsBrowserTest,
|
| MAYBE_UninstallSearchResult) {
|
| + // TODO(calamity): This test fails in the experimental app list
|
| + // (http://crbug.com/438119). For now, force the test to run in the classic
|
| + // app list.
|
| + base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| + app_list::switches::kDisableExperimentalAppList);
|
| +
|
| base::FilePath test_extension_path;
|
| ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_extension_path));
|
| test_extension_path = test_extension_path.AppendASCII("extensions")
|
|
|