Have media content and chrome browser tests load data from media/test/data

chrome/browser/media/media_browsertest.h

Index: chrome/browser/media/media_browsertest.h
diff --git a/chrome/browser/media/media_browsertest.h b/chrome/browser/media/media_browsertest.h
index be62f7a3cf954e9cead431a9bf3688aaf511f4bc..f1375cf66d2ac14fe8838a8645570a8cc826ecbf 100644
--- a/chrome/browser/media/media_browsertest.h
+++ b/chrome/browser/media/media_browsertest.h
@@ -10,6 +10,7 @@
 
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "media/base/test_data_util.h"
 
 namespace content {
 class TitleWatcher;
@@ -21,8 +22,6 @@ class TitleWatcher;
 class MediaBrowserTest : public InProcessBrowserTest,
                          public content::WebContentsObserver {
  protected:
-  typedef std::pair<std::string, std::string> StringPair;
-
   // Common test results.
   static const char kEnded[];
   // TODO(xhwang): Report detailed errors, e.g. "ERROR-3".
@@ -38,12 +37,13 @@ class MediaBrowserTest : public InProcessBrowserTest,
   // page, otherwise a local file URL is loaded inside the content shell.
   // It uses RunTest() to check for expected test output.
   void RunMediaTestPage(const std::string& html_page,
-                        std::vector<StringPair>* query_params,
-                        const std::string& expected, bool http);
+                        std::vector<media::StringPair>* query_params,
+                        const std::string& expected,
+                        bool http);
 
   // Opens a URL and waits for the document title to match either one of the
   // default strings or the expected string.
-  base::string16 RunTest(const GURL& gurl, const std::string& expected);
+  std::string RunTest(const GURL& gurl, const std::string& expected);

[xhwang, 2014/07/07 17:39:54]

Document about what the return value is.

[shadi, 2014/07/07 22:58:44]

Done.

 
   virtual void AddWaitForTitles(content::TitleWatcher* title_watcher);