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

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

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/extensions/extension_host.h" 7 #include "chrome/browser/extensions/extension_host.h"
7 #include "chrome/browser/extensions/extension_process_manager.h" 8 #include "chrome/browser/extensions/extension_process_manager.h"
8 #include "chrome/browser/renderer_host/render_view_host.h" 9 #include "chrome/browser/renderer_host/render_view_host.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/test/ui_test_utils.h" 13 #include "chrome/test/ui_test_utils.h"
13 14
14 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { 15 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) {
15 ASSERT_TRUE(RunExtensionTest("alert")) << message_; 16 ASSERT_TRUE(RunExtensionTest("alert")) << message_;
16 17
17 const Extension* extension = GetSingleLoadedExtension(); 18 const Extension* extension = GetSingleLoadedExtension();
18 ExtensionHost* host = browser()->profile()->GetExtensionProcessManager()-> 19 ExtensionHost* host = browser()->profile()->GetExtensionProcessManager()->
19 GetBackgroundHostForExtension(extension); 20 GetBackgroundHostForExtension(extension);
20 ASSERT_TRUE(host); 21 ASSERT_TRUE(host);
21 host->render_view_host()->ExecuteJavascriptInWebFrame(L"", 22 host->render_view_host()->ExecuteJavascriptInWebFrame(string16(),
22 L"alert('This should not crash.');"); 23 ASCIIToUTF16("alert('This should not crash.');"));
23 24
24 AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); 25 AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
25 ASSERT_TRUE(alert); 26 ASSERT_TRUE(alert);
26 alert->CloseModalDialog(); 27 alert->CloseModalDialog();
27 } 28 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698