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

Side by Side Diff: chrome/browser/extensions/alert_apitest.cc

Issue 11246003: Remove Profile->GetExtensionProcessManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix extension_crash_recovery_browsertest Created 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_host.h" 7 #include "chrome/browser/extensions/extension_host.h"
8 #include "chrome/browser/extensions/extension_process_manager.h" 8 #include "chrome/browser/extensions/extension_process_manager.h"
9 #include "chrome/browser/extensions/extension_system.h"
9 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" 11 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
11 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
13 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
14 #include "content/public/browser/render_view_host.h" 15 #include "content/public/browser/render_view_host.h"
15 16
16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { 17 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) {
17 ASSERT_TRUE(RunExtensionTest("alert")) << message_; 18 ASSERT_TRUE(RunExtensionTest("alert")) << message_;
18 19
19 const extensions::Extension* extension = GetSingleLoadedExtension(); 20 const extensions::Extension* extension = GetSingleLoadedExtension();
20 extensions::ExtensionHost* host = 21 extensions::ExtensionHost* host =
21 browser()->profile()->GetExtensionProcessManager()-> 22 extensions::ExtensionSystem::Get(browser()->profile())->
22 GetBackgroundHostForExtension(extension->id()); 23 process_manager()->GetBackgroundHostForExtension(extension->id());
23 ASSERT_TRUE(host); 24 ASSERT_TRUE(host);
24 host->render_view_host()->ExecuteJavascriptInWebFrame(string16(), 25 host->render_view_host()->ExecuteJavascriptInWebFrame(string16(),
25 ASCIIToUTF16("alert('This should not crash.');")); 26 ASCIIToUTF16("alert('This should not crash.');"));
26 27
27 AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); 28 AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
28 ASSERT_TRUE(alert); 29 ASSERT_TRUE(alert);
29 alert->CloseModalDialog(); 30 alert->CloseModalDialog();
30 } 31 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698