Add default query method to WebIntentsRegistry.

chrome/browser/intents/web_intents_registry_unittest.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 "base/file_util.h"
 #include "base/json/json_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/test_extension_service.h"
+#include "chrome/browser/intents/default_web_intent_service.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using webkit_glue::WebIntentServiceData;
@@ skipping 98 matching lines @@
    virtual void OnIntentsQueryDone(
        WebIntentsRegistry::QueryID id,
        const std::vector<webkit_glue::WebIntentServiceData>& services) {
      DCHECK(id == expected_id_);
      services_ = services;
 
      DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
      MessageLoop::current()->Quit();
    }
 
+   virtual void OnIntentsDefaultsQueryDone(
+       WebIntentsRegistry::QueryID id,
+       const DefaultWebIntentService& default_service) {
+     DCHECK(id == expected_id_);
+     default_ = default_service;
+
+     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+     MessageLoop::current()->Quit();
+   }
+
    // Wait for the UI message loop to terminate - happens when OnIntesQueryDone
    // is invoked.
    void WaitForData() {
      DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
      MessageLoop::current()->Run();
    }
 
    // QueryID callback is tied to.
    WebIntentsRegistry::QueryID expected_id_;
 
    // Result data from callback.
    std::vector<webkit_glue::WebIntentServiceData> services_;
+
+   // Result default data from callback.
+   DefaultWebIntentService default_;
 };
 
 TEST_F(WebIntentsRegistryTest, BasicTests) {
   webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
   service.title = ASCIIToUTF16("Google's Sharing Service");
 
   registry_.RegisterIntentService(service);
@@ skipping 168 matching lines @@
   consumer.expected_id_ = registry_.GetIntentServices(
       ASCIIToUTF16("http://webintents.org/share"),
       ASCIIToUTF16("*"), &consumer);
   consumer.WaitForData();
   ASSERT_EQ(4U, consumer.services_.size());
   EXPECT_EQ(services[0], consumer.services_[0]);
   EXPECT_EQ(services[1], consumer.services_[1]);
   EXPECT_EQ(services[2], consumer.services_[2]);
   EXPECT_EQ(services[3], consumer.services_[3]);
 }
+
+TEST_F(WebIntentsRegistryTest, TestGetDefaults) {
+  DefaultWebIntentService default_service;
+  default_service.action = ASCIIToUTF16("share");
+  default_service.type = ASCIIToUTF16("type/*");
+  default_service.user_date = 1;
+  default_service.suppression = 4;

[groby-ooo-7-16, 2012/02/22 01:40:18]

What does user_date = 1 and suppression = 4 mean? (Can you make those constants,
or comment?)

[Greg Billock, 2012/02/23 23:39:00]

Nothing. Just filler to make sure they're preserved.

+  default_service.service_url = "service_url";
+  registry_.RegisterDefaultIntentService(default_service);
+
+  TestConsumer consumer;
+
+  consumer.expected_id_ = registry_.GetDefaultIntentService(
+      ASCIIToUTF16("share"),
+      ASCIIToUTF16("type/plain"),
+      GURL("http://www.google.com/"),
+      &consumer);
+
+  consumer.WaitForData();
+
+  EXPECT_EQ("service_url", consumer.default_.service_url);
+  EXPECT_EQ(1, consumer.default_.user_date);
+  EXPECT_EQ(4, consumer.default_.suppression);
+
+  consumer.default_ = DefaultWebIntentService();

[groby-ooo-7-16, 2012/02/22 01:40:18]

Can you comment the test cases? I.e. "Retrieve existing default", "No existing
default for action", "no existing default for type"? (That's my assumption what
those test, at least) 

[Greg Billock, 2012/02/23 23:39:00]

Done.

+  ASSERT_EQ("", consumer.default_.service_url);
+  consumer.expected_id_ = registry_.GetDefaultIntentService(
+      ASCIIToUTF16("no-share"),
+      ASCIIToUTF16("type/plain"),
+      GURL("http://www.google.com/"),
+      &consumer);
+
+  consumer.WaitForData();
+
+  EXPECT_EQ("", consumer.default_.service_url);
+
+  consumer.default_ = DefaultWebIntentService();
+  ASSERT_EQ("", consumer.default_.service_url);
+  consumer.expected_id_ = registry_.GetDefaultIntentService(
+      ASCIIToUTF16("share"),
+      ASCIIToUTF16("notype/plain"),
+      GURL("http://www.google.com/"),
+      &consumer);
+
+  consumer.WaitForData();
+
+  EXPECT_EQ("", consumer.default_.service_url);
+}