Move JavascriptTestObserver from chrome to content.

chrome/test/ppapi/ppapi_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/test/base/javascript_test_observer.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/test/javascript_test_observer.h"
 #include "content/public/test/test_renderer_host.h"
 
 using content::RenderViewHost;
 
 // This macro finesses macro expansion to do what we want.
 #define STRIP_PREFIXES(test_name) StripPrefixes(#test_name)
 // Turn the given token into a string. This allows us to use precompiler stuff
 // to turn names into DISABLED_Foo, but still pass a string to RunTest.
 #define STRINGIFY(test_name) #test_name
 #define LIST_TEST(test_name) STRINGIFY(test_name) ","
@@ skipping 1169 matching lines @@
   GURL url = GetTestFileUrl("View_CreatedInvisible");
   chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK);
   params.disposition = NEW_BACKGROUND_TAB;
   ui_test_utils::NavigateToURL(&params);
 }
 
 // This test messes with tab visibility so is custom.
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) {
   // The plugin will be loaded in the foreground tab and will send us a message.
   PPAPITestMessageHandler handler;
-  JavascriptTestObserver observer(
+  content::JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents(),
       &handler);
 
   GURL url = GetTestFileUrl("View_PageHideShow");
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_TRUE(observer.Run()) << handler.error_message();
   EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str());
   observer.Reset();
 
@@ skipping 150 matching lines @@
           LIST_TEST(FlashDRM_GetHmonitor)
           LIST_TEST(FlashDRM_GetVoucherFile));
 }
 
 TEST_PPAPI_IN_PROCESS(TalkPrivate)
 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
 
 #if defined(OS_CHROMEOS)
 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
 #endif