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

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

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Chrome OS compile failure. Created 6 years, 1 month 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/common/extension_set.h" 11 #include "extensions/common/extension_set.h"
11 12
12 const char AppListTestBase::kHostedAppId[] = 13 const char AppListTestBase::kHostedAppId[] =
13 "dceacbkfkmllgmjmbhgkpjegnodmildf"; 14 "dceacbkfkmllgmjmbhgkpjegnodmildf";
14 const char AppListTestBase::kPackagedApp1Id[] = 15 const char AppListTestBase::kPackagedApp1Id[] =
15 "emfkafnhnpcmabnnkckkchdilgeoekbo"; 16 "emfkafnhnpcmabnnkckkchdilgeoekbo";
16 const char AppListTestBase::kPackagedApp2Id[] = 17 const char AppListTestBase::kPackagedApp2Id[] =
17 "jlklkagmeajbjiobondfhiekepofmljl"; 18 "jlklkagmeajbjiobondfhiekepofmljl";
18 19
19 AppListTestBase::AppListTestBase() {} 20 AppListTestBase::AppListTestBase() {}
(...skipping 11 matching lines...) Expand all
31 // - 1 ephemeral app (which should not be visible in the launcher) 32 // - 1 ephemeral app (which should not be visible in the launcher)
32 base::FilePath source_install_dir = 33 base::FilePath source_install_dir =
33 data_dir().AppendASCII("app_list").AppendASCII("Extensions"); 34 data_dir().AppendASCII("app_list").AppendASCII("Extensions");
34 base::FilePath pref_path = source_install_dir 35 base::FilePath pref_path = source_install_dir
35 .DirName() 36 .DirName()
36 .Append(chrome::kPreferencesFilename); 37 .Append(chrome::kPreferencesFilename);
37 InitializeInstalledExtensionService(pref_path, source_install_dir); 38 InitializeInstalledExtensionService(pref_path, source_install_dir);
38 service_->Init(); 39 service_->Init();
39 40
40 // There should be 5 extensions in the test profile. 41 // There should be 5 extensions in the test profile.
41 const extensions::ExtensionSet* extensions = service_->extensions(); 42 ASSERT_EQ(static_cast<size_t>(5), registry()->enabled_extensions().size());
Lei Zhang 2014/11/11 22:09:22 static_cast -> 5U
Reilly Grant (use Gerrit) 2014/11/11 22:19:29 Done.
42 ASSERT_EQ(static_cast<size_t>(5), extensions->size());
43 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698