Switch to prod API, test BuildQueryURL, use it in all other tests

R=binji
BUG=
TEST=


Review URL: http://codereview.chromium.org/9794003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128130 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 30 insertions, 17 deletions

diff --git a/chrome/browser/intents/cws_intents_registry.cc b/chrome/browser/intents/cws_intents_registry.cc
index 58d4c35..e17f0b0 100644
--- a/chrome/browser/intents/cws_intents_registry.cc
+++ b/chrome/browser/intents/cws_intents_registry.cc
@@ -20,10 +20,9 @@
 
 namespace {
 
-// URL for CWS intents API. TODO(groby): points to staging, fix for M18 release.
+// URL for CWS intents API.
 const char kCWSIntentServiceURL[] =
-  "https://www-googleapis-staging.sandbox.google.com"
-  "/chromewebstore/v1.1b/items/intent";
+  "https://www.googleapis.com/chromewebstore/v1.1b/items/intent";
 
 }  // namespace
 
diff --git a/chrome/browser/intents/cws_intents_registry_unittest.cc b/chrome/browser/intents/cws_intents_registry_unittest.cc
index 690a542..2f149fc 100644
--- a/chrome/browser/intents/cws_intents_registry_unittest.cc
+++ b/chrome/browser/intents/cws_intents_registry_unittest.cc
@@ -14,19 +14,15 @@
 
 namespace {
 
-const char kCWSQueryInvalid[] =
-    "https://www-googleapis-staging.sandbox.google.com"
-    "/chromewebstore/v1.1b/items/intent"
-      "?intent=foo&mime_types=foo";
 const char kCWSResponseInvalid[] =
-    "{\"error\":{\"errors\":[{\"domain\":\"global\",\"reason\":\"invalid\","
-    "\"message\":\"Invalid mimetype:foo\"}],\"code\":400,"
-    "\"message\":\"Invalid mimetype:foo\"}}\"";
-
-const char kCWSQueryValid[] =
-    "https://www-googleapis-staging.sandbox.google.com"
-    "/chromewebstore/v1.1b/items/intent"
-      "?intent=http%3A%2F%2Fwebintents.org%2Fedit&mime_types=*%2Fpng";
+    "{\"error\":{"
+      "\"errors\":[{"
+        "\"domain\":\"global\","
+        "\"reason\":\"invalid\","
+        "\"message\":\"Invalid mimetype:foo\"}],"
+      "\"code\":400,"
+      "\"message\":\"Invalid mimetype:foo\"}}\"";
+
 const char kCWSResponseValid[] =
   "{\"kind\":\"chromewebstore#itemList\","
   " \"total_items\":1,"
@@ -96,6 +92,14 @@ class CWSIntentsRegistryTest : public testing::Test {
     extensions_ = extensions;
   }
 
+  void SetFakeResponse(const std::string& action, const std::string& mime,
+      const std::string& response) {
+    test_factory_.SetFakeResponse(
+        CWSIntentsRegistry::BuildQueryURL(
+            ASCIIToUTF16(action),ASCIIToUTF16(mime)).spec(),
+        response, true);
+  }
+
   CWSIntentsRegistry::IntentExtensionList extensions_;
   FakeURLFetcherFactory test_factory_;
 
@@ -108,7 +112,7 @@ class CWSIntentsRegistryTest : public testing::Test {
 TEST_F(CWSIntentsRegistryTest, ValidQuery) {
   const scoped_refptr<TestURLRequestContextGetter> context_getter(
       new TestURLRequestContextGetter(ui_loop_.message_loop_proxy()));
-  test_factory_.SetFakeResponse(kCWSQueryValid, kCWSResponseValid, true);
+  SetFakeResponse("http://webintents.org/edit", "*/png", kCWSResponseValid);
 
   CWSIntentsRegistry registry(context_getter);
   registry.GetIntentServices(ASCIIToUTF16("http://webintents.org/edit"),
@@ -132,7 +136,7 @@ TEST_F(CWSIntentsRegistryTest, ValidQuery) {
 TEST_F(CWSIntentsRegistryTest, InvalidQuery) {
   const scoped_refptr<TestURLRequestContextGetter> context_getter(
       new TestURLRequestContextGetter(ui_loop_.message_loop_proxy()));
-  test_factory_.SetFakeResponse(kCWSQueryInvalid, kCWSResponseInvalid, true);
+  SetFakeResponse("foo", "foo", kCWSResponseInvalid);
 
   CWSIntentsRegistry registry(context_getter);
   registry.GetIntentServices(ASCIIToUTF16("foo"),
@@ -143,3 +147,13 @@ TEST_F(CWSIntentsRegistryTest, InvalidQuery) {
   WaitForResults();
   EXPECT_EQ(0UL, extensions_.size());
 }
+
+TEST_F(CWSIntentsRegistryTest, BuildQueryURL) {
+  const std::string kExpectedURL = "https://www.googleapis.com"
+      "/chromewebstore/v1.1b/items/intent"
+      "?intent=action&mime_types=mime%2Ftype";
+  GURL url = CWSIntentsRegistry::BuildQueryURL(ASCIIToUTF16("action"),
+                                               ASCIIToUTF16("mime/type"));
+
+  EXPECT_EQ(kExpectedURL, url.spec().substr(0, kExpectedURL.size()));
+}