From 2636d976fb583560c0817dc258a9e37578501bec Mon Sep 17 00:00:00 2001
From: "anand.ratn" <anand.ratn@samsung.com>
Date: Mon, 29 Sep 2014 21:06:58 -0700
Subject: Use base::StringPairs where appropriate for src/media/

Becuase base/strings/string_split.h defines:
typedef std::vector<std::pair<std::string, std::string> > StringPairs;

BUG=412250

Review URL: https://codereview.chromium.org/593023002

Cr-Commit-Position: refs/heads/master@{#297359}
---
 content/browser/media/encrypted_media_browsertest.cc | 4 ++--
 content/browser/media/media_browsertest.cc           | 6 +++---
 content/browser/media/media_browsertest.h            | 2 +-
 content/browser/media/media_source_browsertest.cc    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'content')

diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index 1069537..0716622 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -80,7 +80,7 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
       return;
     }
 
-    media::QueryParams query_params;
+    base::StringPairs query_params;
     query_params.push_back(std::make_pair("keySystem", CurrentKeySystem()));
     query_params.push_back(std::make_pair("runEncrypted", "1"));
     RunMediaTestPage("mse_config_change.html", query_params, kEnded, true);
@@ -101,7 +101,7 @@ class EncryptedMediaTest : public content::MediaBrowserTest,
       return;
     }
 
-    media::QueryParams query_params;
+    base::StringPairs query_params;
     query_params.push_back(std::make_pair("mediaFile", media_file));
     query_params.push_back(std::make_pair("mediaType", media_type));
     query_params.push_back(std::make_pair("keySystem", key_system));
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index 0ffc029..46f7a49 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -28,7 +28,7 @@ const char MediaBrowserTest::kError[] = "ERROR";
 const char MediaBrowserTest::kFailed[] = "FAILED";
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
-                                        const media::QueryParams& query_params,
+                                        const base::StringPairs& query_params,
                                         const std::string& expected_title,
                                         bool http) {
   GURL gurl;
@@ -94,7 +94,7 @@ class MediaTest : public testing::WithParamInterface<bool>,
   void PlayMedia(const std::string& tag,
                  const std::string& media_file,
                  bool http) {
-    media::QueryParams query_params;
+    base::StringPairs query_params;
     query_params.push_back(std::make_pair(tag, media_file));
     RunMediaTestPage("player.html", query_params, kEnded, http);
   }
@@ -104,7 +104,7 @@ class MediaTest : public testing::WithParamInterface<bool>,
     expected += base::IntToString(width);
     expected += " ";
     expected += base::IntToString(height);
-    media::QueryParams query_params;
+    base::StringPairs query_params;
     query_params.push_back(std::make_pair("video", media_file));
     RunMediaTestPage("player.html", query_params, expected, false);
   }
diff --git a/content/browser/media/media_browsertest.h b/content/browser/media/media_browsertest.h
index 4be3197..caf5d14 100644
--- a/content/browser/media/media_browsertest.h
+++ b/content/browser/media/media_browsertest.h
@@ -29,7 +29,7 @@ class MediaBrowserTest : public ContentBrowserTest {
   // 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,
-                        const media::QueryParams& query_params,
+                        const base::StringPairs& query_params,
                         const std::string& expected,
                         bool http);
 
diff --git a/content/browser/media/media_source_browsertest.cc b/content/browser/media/media_source_browsertest.cc
index 90d0c84..3b22bbf 100644
--- a/content/browser/media/media_source_browsertest.cc
+++ b/content/browser/media/media_source_browsertest.cc
@@ -40,7 +40,7 @@ class MediaSourceTest : public content::MediaBrowserTest {
       return;
     }
 
-    media::QueryParams query_params;
+    base::StringPairs query_params;
     query_params.push_back(std::make_pair("mediaFile", media_file));
     query_params.push_back(std::make_pair("mediaType", media_type));
     RunMediaTestPage("media_source_player.html", query_params, expectation,
@@ -86,7 +86,7 @@ IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
     return;
   }
   RunMediaTestPage("mse_config_change.html",
-                   media::QueryParams(),
+                   base::StringPairs(),
                    kEnded,
                    true);
 }
-- 
cgit v1.1