Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/webdata/web_data_service_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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 25 matching lines @@
 #include "webkit/glue/form_field.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::WaitableEvent;
 using testing::_;
 using testing::DoDefault;
 using testing::ElementsAreArray;
 using testing::Pointee;
 using testing::Property;
+using webkit_glue::WebIntentServiceData;
 
 typedef std::vector<AutofillChange> AutofillChangeList;
 
 static const int kWebDataServiceTimeoutSeconds = 8;
 
 ACTION_P(SignalEvent, event) {
   event->Signal();
 }
 
 class AutofillDBThreadObserverHelper : public DBThreadObserverHelper {
@@ skipping 87 matching lines @@
   scoped_refptr<AutofillDBThreadObserverHelper> observer_helper_;
   WaitableEvent done_event_;
 };
 
 // Simple consumer for WebIntents data. Stores the result data and quits UI
 // message loop when callback is invoked.
 class WebIntentsConsumer: public WebDataServiceConsumer {
  public:
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result) {
-    intents.clear();
+    services.clear();
     if (result) {
       DCHECK(result->GetType() == WEB_INTENTS_RESULT);
-      intents = static_cast<
+      services = static_cast<
           const WDResult<std::vector<WebIntentServiceData> >*>(result)->
               GetValue();
     }
 
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     MessageLoop::current()->Quit();
   }
 
   // Run the current message loop. OnWebDataServiceRequestDone will invoke
   // MessageLoop::Quit on completion, so this call will finish at that point.
   static void WaitUntilCalled() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     MessageLoop::current()->Run();
   }
 
   // Result data from completion callback.
-  std::vector<WebIntentServiceData> intents;
+  std::vector<WebIntentServiceData> services;

[groby-ooo-7-16, 2011/10/31 20:53:37]

nit: should be services_ 

[Greg Billock, 2011/11/01 17:11:17]

Done.

 };
 
 TEST_F(WebDataServiceAutofillTest, FormFillAdd) {
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::ADD, AutofillKey(name1_, value1_)),
     AutofillChange(AutofillChange::ADD, AutofillKey(name2_, value2_))
   };
 
   // This will verify that the correct notification is triggered,
   // passing the correct list of autofill keys in the details.
@@ skipping 410 matching lines @@
   MessageLoop::current()->Run();
   EXPECT_EQ(handle2, card_consumer2.handle());
   ASSERT_EQ(0U, card_consumer2.result().size());
 }
 
 TEST_F(WebDataServiceTest, WebIntents) {
   WebIntentsConsumer consumer;
 
   wds_->GetWebIntents(ASCIIToUTF16("share"), &consumer);
   WebIntentsConsumer::WaitUntilCalled();
-  EXPECT_EQ(0U, consumer.intents.size());
+  EXPECT_EQ(0U, consumer.services.size());
 
   WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
   wds_->AddWebIntent(service);
 
   service.type = ASCIIToUTF16("video/*");
   wds_->AddWebIntent(service);
 
   wds_->GetWebIntents(ASCIIToUTF16("share"), &consumer);
   WebIntentsConsumer::WaitUntilCalled();
-  ASSERT_EQ(2U, consumer.intents.size());
+  ASSERT_EQ(2U, consumer.services.size());
 
-  if (consumer.intents[0].type != ASCIIToUTF16("image/*"))
-    std::swap(consumer.intents[0],consumer.intents[1]);
+  if (consumer.services[0].type != ASCIIToUTF16("image/*"))
+    std::swap(consumer.services[0],consumer.services[1]);
 
-  EXPECT_EQ(service.service_url, consumer.intents[0].service_url);
-  EXPECT_EQ(service.action, consumer.intents[0].action);
-  EXPECT_EQ(ASCIIToUTF16("image/*"), consumer.intents[0].type);
-  EXPECT_EQ(service.service_url, consumer.intents[1].service_url);
-  EXPECT_EQ(service.action, consumer.intents[1].action);
-  EXPECT_EQ(service.type, consumer.intents[1].type);
+  EXPECT_EQ(service.service_url, consumer.services[0].service_url);
+  EXPECT_EQ(service.action, consumer.services[0].action);
+  EXPECT_EQ(ASCIIToUTF16("image/*"), consumer.services[0].type);
+  EXPECT_EQ(service.service_url, consumer.services[1].service_url);
+  EXPECT_EQ(service.action, consumer.services[1].action);
+  EXPECT_EQ(service.type, consumer.services[1].type);
 
   service.type = ASCIIToUTF16("image/*");
   wds_->RemoveWebIntent(service);
 
   wds_->GetWebIntents(ASCIIToUTF16("share"), &consumer);
   WebIntentsConsumer::WaitUntilCalled();
-  ASSERT_EQ(1U, consumer.intents.size());
+  ASSERT_EQ(1U, consumer.services.size());
 
   service.type = ASCIIToUTF16("video/*");
-  EXPECT_EQ(service.service_url, consumer.intents[0].service_url);
-  EXPECT_EQ(service.action, consumer.intents[0].action);
-  EXPECT_EQ(service.type, consumer.intents[0].type);
+  EXPECT_EQ(service.service_url, consumer.services[0].service_url);
+  EXPECT_EQ(service.action, consumer.services[0].action);
+  EXPECT_EQ(service.type, consumer.services[0].type);
 }
 
 TEST_F(WebDataServiceTest, WebIntentsGetAll) {
   WebIntentsConsumer consumer;
 
   WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
   wds_->AddWebIntent(service);
 
   service.action = ASCIIToUTF16("edit");
   wds_->AddWebIntent(service);
 
   wds_->GetAllWebIntents(&consumer);
   WebIntentsConsumer::WaitUntilCalled();
-  ASSERT_EQ(2U, consumer.intents.size());
+  ASSERT_EQ(2U, consumer.services.size());
 
-  if (consumer.intents[0].action != ASCIIToUTF16("edit"))
-    std::swap(consumer.intents[0],consumer.intents[1]);
+  if (consumer.services[0].action != ASCIIToUTF16("edit"))
+    std::swap(consumer.services[0],consumer.services[1]);
 
-  EXPECT_EQ(service, consumer.intents[0]);
+  EXPECT_EQ(service, consumer.services[0]);
   service.action = ASCIIToUTF16("share");
-  EXPECT_EQ(service, consumer.intents[1]);
+  EXPECT_EQ(service, consumer.services[1]);
 }