Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/web_intents_registry.h"
@@ skipping 45 matching lines @@
                WebIntentPicker*(Browser* browser,
                                 TabContentsWrapper* wrapper,
                                 WebIntentPickerDelegate* delegate));
   MOCK_METHOD1(ClosePicker, void(WebIntentPicker* picker));
 };
 
 class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
  protected:
   void AddWebIntentService(const string16& action,
                            const GURL& service_url) {
-    WebIntentServiceData web_intent_service_data;
-    web_intent_service_data.action = action;
-    web_intent_service_data.type = kType;
-    web_intent_service_data.service_url = service_url;
-    web_data_service_->AddWebIntent(web_intent_service_data);
+    webkit_glue::WebIntentServiceData service;
+    service.action = action;
+    service.type = kType;
+    service.service_url = service_url;
+    web_data_service_->AddWebIntent(service);
   }
 
   void SetPickerExpectations(int expected_service_count,
                              int expected_default_favicons) {
     EXPECT_CALL(*picker_factory_, Create(_, _, _)).
         WillOnce(DoAll(SaveArg<2>(&delegate_), Return(&picker_)));
     EXPECT_CALL(picker_,
                 SetServiceURLs(VectorIsOfSize(expected_service_count))).
         Times(1);
     EXPECT_CALL(picker_, SetDefaultServiceIcon(_)).
@@ skipping 45 matching lines @@
   SetPickerExpectations(2, 2);
 
   controller_->ShowDialog(NULL, kAction1, kType);
   WaitForDialogToShow();
 
   delegate_->OnServiceChosen(1);
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL2),
             browser()->GetSelectedTabContents()->GetURL());
 }