chrome/browser/ui/app_list/app_list_test_util.cc - Issue 709813004: Remove the deprecated function ExtensionService::extensions().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/themes/theme_syncable_service_unittest.cc ('k') | chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc » ('j') | chrome/browser/ui/webui/policy_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/app_list_test_util.cc

diff --git a/chrome/browser/ui/app_list/app_list_test_util.cc b/chrome/browser/ui/app_list/app_list_test_util.cc

index da8f0791e8ecf7837e53e30abe623ece83773618..ae0b02a2246e174684817dbe43d53f92fa4605be 100644

--- a/chrome/browser/ui/app_list/app_list_test_util.cc

+++ b/chrome/browser/ui/app_list/app_list_test_util.cc

@@ -7,6 +7,7 @@

#include "base/files/file_path.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/common/chrome_constants.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension_set.h"

const char AppListTestBase::kHostedAppId[] =

@@ -38,6 +39,5 @@ void AppListTestBase::SetUp() {

service_->Init();

// There should be 5 extensions in the test profile.

- const extensions::ExtensionSet* extensions = service_->extensions();

- ASSERT_EQ(static_cast<size_t>(5), extensions->size());

+ 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.

}