chrome/browser/translate/translate_manager_browsertest.cc - Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem.

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/translate/translate_manager_browsertest.cc

Issue 9369013: Take extensions out of Profile into a profile-keyed service, ExtensionSystem. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rerebase Created 8 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/translate/translate_manager_browsertest.cc

diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc

index 4ab7a43a91649499adc71c078446190cc264e197..e07788a98973c29c182332b097316751de9826da 100644

--- a/chrome/browser/translate/translate_manager_browsertest.cc

+++ b/chrome/browser/translate/translate_manager_browsertest.cc

@@ -13,6 +13,8 @@

#include "base/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/app/chrome_command_ids.h"

+#include "chrome/browser/extensions/extension_system_factory.h"

+#include "chrome/browser/extensions/test_extension_system.h"

#include "chrome/browser/infobars/infobar.h"

#include "chrome/browser/infobars/infobar_tab_helper.h"

#include "chrome/browser/prefs/pref_change_registrar.h"

@@ -1305,7 +1307,7 @@ TEST_F(TranslateManagerTest, ContextMenu) {

// translate" infobar when the translation is accepted/declined 3 times,

// only when not in incognito mode.

TEST_F(TranslateManagerTest, BeforeTranslateExtraButtons) {

- Profile* profile =

+ Profile* profile =

Profile::FromBrowserContext(contents()->GetBrowserContext());

TranslatePrefs translate_prefs(profile->GetPrefs());

translate_prefs.ResetTranslationAcceptedCount("fr");

@@ -1318,7 +1320,9 @@ TEST_F(TranslateManagerTest, BeforeTranslateExtraButtons) {

TranslateInfoBarDelegate* infobar;

TestingProfile* test_profile =

static_cast<TestingProfile*>(contents()->GetBrowserContext());

- test_profile->CreateExtensionProcessManager();

+ static_cast<TestExtensionSystem*>(

+ ExtensionSystemFactory::GetForProfile(test_profile))->

+ CreateExtensionProcessManager();

test_profile->set_incognito(true);

for (int i = 0; i < 8; ++i) {

SCOPED_TRACE(::testing::Message() << "Iteration " << i <<