Move ExecuteJavaScript functions from ui_test_utils.h to browser_test_utils.h so they can be reused…

chrome/browser/extensions/subscribe_page_action_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/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
 
 using content::WebContents;
 using extensions::Extension;
 
 namespace {
 
 const std::string kSubscribePage = "/subscribe.html";
 const std::string kFeedPageMultiRel = "files/feeds/feed_multi_rel.html";
 const std::string kValidFeedNoLinks = "files/feeds/feed_nolinks.xml";
 const std::string kValidFeed0 = "files/feeds/feed_script.xml";
@@ skipping 52 matching lines @@
   }
 }
 
 bool ValidatePageElement(WebContents* tab,
                          const std::wstring& frame,
                          const std::wstring& javascript,
                          const std::string& expected_value) {
   std::string returned_value;
   std::string error;
 
-  if (!ui_test_utils::ExecuteJavaScriptAndExtractString(
+  if (!content::ExecuteJavaScriptAndExtractString(
           tab->GetRenderViewHost(),
           frame,
           javascript, &returned_value))
     return false;
 
   EXPECT_STREQ(expected_value.c_str(), returned_value.c_str());
   return expected_value == returned_value;
 }
 
 // Navigates to a feed page and, if |sniff_xml_type| is set, wait for the
@@ skipping 244 matching lines @@
   std::string id = extension->id();
 
   // Valid feed but containing no links.
   NavigateToFeedAndValidate(
       test_server(), kValidFeedNoLinks, browser(), id, true,
       "Feed for MyFeedTitle",
       "Title with no link",
       "Desc",
       "No error");
 }