Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/intents/web_intents_registry_unittest.cc

 // Copyright (c) 2011 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/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using webkit_glue::WebIntentServiceData;
+
 class MockExtensionService: public ExtensionServiceInterface {
  public:
   virtual ~MockExtensionService() {}
   MOCK_CONST_METHOD0(extensions, const ExtensionList*());
   MOCK_METHOD0(pending_extension_manager, PendingExtensionManager*());
   MOCK_METHOD4(UpdateExtension, bool(const std::string& id,
                                      const FilePath& path,
                                      const GURL& download_url,
                                      CrxInstaller** out_crx_installer));
   MOCK_CONST_METHOD2(GetExtensionById,
@@ skipping 28 matching lines @@
   path = path.AppendASCII("extensions")
       .AppendASCII("manifest_tests")
       .AppendASCII(filename.c_str());
   EXPECT_TRUE(file_util::PathExists(path));
 
   JSONFileValueSerializer serializer(path);
   return static_cast<DictionaryValue*>(serializer.Deserialize(NULL, error));
 }
 
 namespace {
+
 scoped_refptr<Extension> LoadExtensionWithLocation(
     DictionaryValue* value,
     Extension::Location location,
     bool strict_error_checks,
     std::string* error) {
   FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("extensions").AppendASCII("manifest_tests");
   int flags = Extension::NO_FLAGS;
   if (strict_error_checks)
@@ skipping 19 matching lines @@
 }
 
 scoped_refptr<Extension> LoadAndExpectSuccess(const std::string& name) {
   std::string error;
   scoped_refptr<Extension> extension = LoadExtension(name, &error);
   EXPECT_TRUE(extension) << name;
   EXPECT_EQ("", error) << name;
   return extension;
 }
 
-}
+}  // namespace
 
 class WebIntentsRegistryTest : public testing::Test {
  public:
    WebIntentsRegistryTest()
      : ui_thread_(BrowserThread::UI, &message_loop_),
        db_thread_(BrowserThread::DB) {}
 
  protected:
   virtual void SetUp() {
     CommandLine::ForCurrentProcess()->AppendSwitch("--enable-web-intents");
@@ skipping 25 matching lines @@
   WebIntentsRegistry registry_;
   ScopedTempDir temp_dir_;
 };
 
 // Simple consumer for WebIntentsRegistry notifications. Stores result data and
 // terminates UI thread when callback is invoked.
 class TestConsumer: public WebIntentsRegistry::Consumer {
  public:
    virtual void OnIntentsQueryDone(
        WebIntentsRegistry::QueryID id,
-       const std::vector<WebIntentServiceData>& services) {
+       const std::vector<webkit_glue::WebIntentServiceData>& services) {
      DCHECK(id == expected_id_);
      services_ = services;
 
      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();
    }
 
-   WebIntentsRegistry::QueryID expected_id_;  // QueryID callback is tied to.
-   std::vector<WebIntentServiceData> services_;  // Result data from callback.
+   // QueryID callback is tied to.
+   WebIntentsRegistry::QueryID expected_id_;
+
+   // Result data from callback.
+   std::vector<webkit_glue::WebIntentServiceData> services_;
 };
 
 TEST_F(WebIntentsRegistryTest, BasicTests) {
-  WebIntentServiceData service;
+  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_.RegisterIntentProvider(service);
 
   service.type = ASCIIToUTF16("video/*");
   registry_.RegisterIntentProvider(service);
 
@@ skipping 18 matching lines @@
   registry_.UnregisterIntentProvider(service);
 
   consumer.expected_id_ = registry_.GetIntentProviders(ASCIIToUTF16("share"),
                                                        ASCIIToUTF16("*"),
                                                        &consumer);
   consumer.WaitForData();
   EXPECT_EQ(1U, consumer.services_.size());
 }
 
 TEST_F(WebIntentsRegistryTest, GetAllIntents) {
-  WebIntentServiceData service;
+  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_.RegisterIntentProvider(service);
 
   service.action = ASCIIToUTF16("search");
   registry_.RegisterIntentProvider(service);
 
   TestConsumer consumer;
@@ skipping 30 matching lines @@
       ASCIIToUTF16("http://webintents.org/edit"), ASCIIToUTF16("*"),
       &consumer);
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
 }
 
 TEST_F(WebIntentsRegistryTest, GetIntentsFromMixedSources) {
   extensions_.push_back(LoadAndExpectSuccess("intent_valid.json"));
   extensions_.push_back(LoadAndExpectSuccess("intent_valid_2.json"));
 
-  WebIntentServiceData service;
+  webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://somewhere.com/intent/edit.html");
   service.action = ASCIIToUTF16("http://webintents.org/edit");
   service.type = ASCIIToUTF16("image/*");
   service.title = ASCIIToUTF16("Image Editing Service");
   registry_.RegisterIntentProvider(service);
 
   TestConsumer consumer;
   consumer.expected_id_ = registry_.GetIntentProviders(
       ASCIIToUTF16("http://webintents.org/edit"), ASCIIToUTF16("*"),
       &consumer);
@@ skipping 71 matching lines @@
   consumer.expected_id_ = registry_.GetIntentProviders(
       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]);
 }