| Index: chrome/test/nacl/nacl_browsertest_util.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest_util.cc b/chrome/test/nacl/nacl_browsertest_util.cc
|
| index 8843aa984344197f1f0362ebd7689697139441a8..19758e1c696aa6306cba950aa57358c49f3f2d1f 100644
|
| --- a/chrome/test/nacl/nacl_browsertest_util.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest_util.cc
|
| @@ -20,7 +20,7 @@
|
| #include "content/public/common/webplugininfo.h"
|
| #include "net/base/net_util.h"
|
|
|
| -typedef TestMessageHandler::MessageResponse MessageResponse;
|
| +typedef content::TestMessageHandler::MessageResponse MessageResponse;
|
|
|
| MessageResponse StructuredMessageHandler::HandleMessage(
|
| const std::string& json) {
|
| @@ -234,9 +234,10 @@ GURL NaClBrowserTestBase::TestURL(
|
| return test_server_->GetURL(expanded_url.MaybeAsASCII());
|
| }
|
|
|
| -bool NaClBrowserTestBase::RunJavascriptTest(const GURL& url,
|
| - TestMessageHandler* handler) {
|
| - JavascriptTestObserver observer(
|
| +bool NaClBrowserTestBase::RunJavascriptTest(
|
| + const GURL& url,
|
| + content::TestMessageHandler* handler) {
|
| + content::JavascriptTestObserver observer(
|
| browser()->tab_strip_model()->GetActiveWebContents(),
|
| handler);
|
| ui_test_utils::NavigateToURL(browser(), url);
|
|
|