summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 19:56:14 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 19:56:14 +0000
commita771dc3feb97ae20170cf5617ba48d6340549698 (patch)
tree2482dd2533a3341ede166407b6eb3761a28ec4e7 /chrome/browser/notifications
parent0f786468a0c44da5093c6759915e1c0384535adf (diff)
downloadchromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.zip
chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.tar.gz
chromium_src-a771dc3feb97ae20170cf5617ba48d6340549698.tar.bz2
Revert 74118 - Remove wstring from RVH's run Javascript command.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6312154 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6459002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
-rw-r--r--chrome/browser/notifications/notifications_interactive_uitest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/notifications/notifications_interactive_uitest.cc b/chrome/browser/notifications/notifications_interactive_uitest.cc
index 7affc66..d2ace68 100644
--- a/chrome/browser/notifications/notifications_interactive_uitest.cc
+++ b/chrome/browser/notifications/notifications_interactive_uitest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/utf_string_conversions.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
@@ -36,8 +35,8 @@ TEST_F(NotificationsPermissionTest, FLAKY_TestUserGestureInfobar) {
// That's considered a user gesture to webkit, and should produce an infobar.
bool result;
ASSERT_TRUE(tab->ExecuteAndExtractBool(
- string16(),
- ASCIIToUTF16("window.domAutomationController.send(request());"),
+ L"",
+ L"window.domAutomationController.send(request());",
&result));
EXPECT_TRUE(result);