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

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

Issue 1257603003: Revert of Add ExecuteJavaScriptForTest and make all tests use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 unified diff | Download patch
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/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
10 #include "components/app_modal/app_modal_dialog.h" 10 #include "components/app_modal/app_modal_dialog.h"
11 #include "content/public/browser/render_frame_host.h" 11 #include "content/public/browser/render_frame_host.h"
12 #include "extensions/browser/extension_host.h" 12 #include "extensions/browser/extension_host.h"
13 #include "extensions/browser/process_manager.h" 13 #include "extensions/browser/process_manager.h"
14 #include "extensions/common/extension.h" 14 #include "extensions/common/extension.h"
15 15
16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { 16 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) {
17 ASSERT_TRUE(RunExtensionTest("alert")) << message_; 17 ASSERT_TRUE(RunExtensionTest("alert")) << message_;
18 18
19 const extensions::Extension* extension = GetSingleLoadedExtension(); 19 const extensions::Extension* extension = GetSingleLoadedExtension();
20 extensions::ExtensionHost* host = 20 extensions::ExtensionHost* host =
21 extensions::ProcessManager::Get(browser()->profile()) 21 extensions::ProcessManager::Get(browser()->profile())
22 ->GetBackgroundHostForExtension(extension->id()); 22 ->GetBackgroundHostForExtension(extension->id());
23 ASSERT_TRUE(host); 23 ASSERT_TRUE(host);
24 host->host_contents()->GetMainFrame()->ExecuteJavaScriptForTests( 24 host->host_contents()->GetMainFrame()->ExecuteJavaScript(
25 base::ASCIIToUTF16("alert('This should not crash.');")); 25 base::ASCIIToUTF16("alert('This should not crash.');"));
26 26
27 app_modal::AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); 27 app_modal::AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
28 ASSERT_TRUE(alert); 28 ASSERT_TRUE(alert);
29 alert->CloseModalDialog(); 29 alert->CloseModalDialog();
30 } 30 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698