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

content/browser/media/media_browsertest.h

Index: content/browser/media/media_browsertest.h
diff --git a/content/browser/media/media_browsertest.h b/content/browser/media/media_browsertest.h
index b242db302590d8f4dcebfd07624f97a12ed4524f..a6a66c33169be7643a7033397d9bc91c7c5878f5 100644
--- a/content/browser/media/media_browsertest.h
+++ b/content/browser/media/media_browsertest.h
@@ -19,7 +19,7 @@ class TitleWatcher;
 // the test http server.
 class MediaBrowserTest : public ContentBrowserTest {
  public:
-  typedef std::pair<const char*, const char*> StringPair;
+  typedef std::pair<std::string, std::string> StringPair;
 
   // Common test results.
   static const char kEnded[];

[jrummell, 2014/07/02 00:33:40]

Should these be std::string since |expected| below is? Or is that not allowed
and we rely on the compiler creating the std::string as needed?

[shadi, 2014/07/02 19:23:36]

I believe I had this conversation with xhwang sometime ago, and the conclusion
was not to use static const for non-primitive types?
xhwang@: can you refresh my memory again? :)

@@ -30,13 +30,13 @@ class MediaBrowserTest : public ContentBrowserTest {
   // If http is true, the test starts a local http test server to load the test
   // page, otherwise a local file URL is loaded inside the content shell.
   // It uses RunTest() to check for expected test output.
-  void RunMediaTestPage(const char* html_page,
+  void RunMediaTestPage(const std::string& html_page,
                         std::vector<StringPair>* query_params,
-                        const char* expected, bool http);
+                        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.
-  void RunTest(const GURL& gurl, const char* expected);
+  base::string16 RunTest(const GURL& gurl, const std::string& expected);

[jrummell, 2014/07/02 00:33:40]

Can the return value be std::string as well? I don't think we have any titles
used that aren't just ASCII characters. If you want, you could add a DCHECK in
the implementation that it is all ASCII values, just to be sure
(base::IsStringASCII()).

[shadi, 2014/07/02 19:23:36]

Yeah, I don't see a problem converting title watcher result to from string16 to
string. 

PS: there already exist a DCHECK in UTF16ToASCII() function to make sure it is
all ASCII.

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