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"
@@ skipping 128 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 15 matching lines @@
   service.type = ASCIIToUTF16("image/*");
   registry_.UnregisterIntentProvider(service);
 
   consumer.expected_id_ = registry_.GetIntentProviders(ASCIIToUTF16("share"),
                                                        &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 29 matching lines @@
   consumer.expected_id_ = registry_.GetIntentProviders(
       ASCIIToUTF16("http://webintents.org/edit"),&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"),&consumer);
   consumer.WaitForData();
   ASSERT_EQ(2U, consumer.services_.size());
 
   consumer.expected_id_ = registry_.GetIntentProviders(
       ASCIIToUTF16("http://webintents.org/share"),&consumer);
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
 }