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

Unified Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 10795090: Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/old_panel_browsertest.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_browsertest.cc
===================================================================
--- chrome/browser/ui/panels/panel_browsertest.cc (revision 148111)
+++ chrome/browser/ui/panels/panel_browsertest.cc (working copy)
@@ -36,6 +36,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_constants.h"
+#include "content/public/test/browser_test_utils.h"
#include "content/test/net/url_request_mock_http_job.h"
#include "net/base/net_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -377,7 +378,7 @@
content::WindowedNotificationObserver enlarge(
chrome::NOTIFICATION_PANEL_STRIP_UPDATED,
content::NotificationService::AllSources());
- EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
+ EXPECT_TRUE(content::ExecuteJavaScript(
panel->GetWebContents()->GetRenderViewHost(),
std::wstring(),
L"changeSize(50);"));
@@ -390,7 +391,7 @@
content::WindowedNotificationObserver shrink(
chrome::NOTIFICATION_PANEL_STRIP_UPDATED,
content::NotificationService::AllSources());
- EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
+ EXPECT_TRUE(content::ExecuteJavaScript(
panel->GetWebContents()->GetRenderViewHost(),
std::wstring(),
L"changeSize(-30);"));
@@ -1500,7 +1501,7 @@
content::WindowedNotificationObserver enlarge(
chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED,
content::Source<Panel>(panel));
- EXPECT_TRUE(ui_test_utils::ExecuteJavaScript(
+ EXPECT_TRUE(content::ExecuteJavaScript(
panel->GetWebContents()->GetRenderViewHost(),
std::wstring(),
L"document.body.innerHTML ="
« no previous file with comments | « chrome/browser/ui/panels/old_panel_browsertest.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698