diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 08:42:11 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-09 08:42:11 +0000 |
| commit | e15be2bb4ca057bf5f9c02115d92042717364d42 (patch) | |
| tree | 13e6c04987b6c8170efbff37fa32c5b8785d4d2d /chrome/browser/translate | |
| parent | 65f8fbbd988207a470e2a399379baa70f4abb282 (diff) | |
| download | chromium_src-e15be2bb4ca057bf5f9c02115d92042717364d42.zip chromium_src-e15be2bb4ca057bf5f9c02115d92042717364d42.tar.gz chromium_src-e15be2bb4ca057bf5f9c02115d92042717364d42.tar.bz2 | |
Revert "Reland 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem."
I believe this change is causing failures in
[SocketApiTest.Socket{TCP,UDP}Extension.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/9648026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
| -rw-r--r-- | chrome/browser/translate/translate_manager_browsertest.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index e07788a..4ab7a43 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -13,8 +13,6 @@ #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" @@ -1307,7 +1305,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"); @@ -1320,9 +1318,7 @@ TEST_F(TranslateManagerTest, BeforeTranslateExtraButtons) { TranslateInfoBarDelegate* infobar; TestingProfile* test_profile = static_cast<TestingProfile*>(contents()->GetBrowserContext()); - static_cast<TestExtensionSystem*>( - ExtensionSystemFactory::GetForProfile(test_profile))-> - CreateExtensionProcessManager(); + test_profile->CreateExtensionProcessManager(); test_profile->set_incognito(true); for (int i = 0; i < 8; ++i) { SCOPED_TRACE(::testing::Message() << "Iteration " << i << |