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

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

Issue 1497193002: Remove all the ephemeral apps code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Self review, Devlin review. Created 5 years 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 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_test_util.h" 5 #include "chrome/browser/ui/app_list/app_list_test_util.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/common/chrome_constants.h" 9 #include "chrome/common/chrome_constants.h"
10 #include "extensions/browser/extension_registry.h" 10 #include "extensions/browser/extension_registry.h"
(...skipping 11 matching lines...) Expand all
22 AppListTestBase::~AppListTestBase() {} 22 AppListTestBase::~AppListTestBase() {}
23 23
24 void AppListTestBase::SetUp() { 24 void AppListTestBase::SetUp() {
25 extensions::ExtensionServiceTestBase::SetUp(); 25 extensions::ExtensionServiceTestBase::SetUp();
26 26
27 // Load "app_list" extensions test profile. 27 // Load "app_list" extensions test profile.
28 // The test profile has 5 extensions: 28 // The test profile has 5 extensions:
29 // - 1 dummy extension (which should not be visible in the launcher) 29 // - 1 dummy extension (which should not be visible in the launcher)
30 // - 2 packaged extension apps 30 // - 2 packaged extension apps
31 // - 1 hosted extension app 31 // - 1 hosted extension app
32 // - 1 ephemeral app (which should not be visible in the launcher)
33 base::FilePath source_install_dir = 32 base::FilePath source_install_dir =
34 data_dir().AppendASCII("app_list").AppendASCII("Extensions"); 33 data_dir().AppendASCII("app_list").AppendASCII("Extensions");
35 base::FilePath pref_path = source_install_dir 34 base::FilePath pref_path = source_install_dir
36 .DirName() 35 .DirName()
37 .Append(chrome::kPreferencesFilename); 36 .Append(chrome::kPreferencesFilename);
38 InitializeInstalledExtensionService(pref_path, source_install_dir); 37 InitializeInstalledExtensionService(pref_path, source_install_dir);
39 service_->Init(); 38 service_->Init();
40 39
41 // There should be 5 extensions in the test profile. 40 // There should be 4 extensions in the test profile.
42 ASSERT_EQ(5U, registry()->enabled_extensions().size()); 41 ASSERT_EQ(4U, registry()->enabled_extensions().size());
43 } 42 }
OLDNEW
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/app_list/search/webstore/webstore_result.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698