Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/ui/intents/web_intent_picker_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #pragma once
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "webkit/glue/web_intent_data.h"
 
 class Browser;
 class FaviconService;
 class GURL;
 class SkBitmap;
 class TabContentsWrapper;
 class WebDataService;
 class WebIntentPicker;
 class WebIntentPickerFactory;
+
+namespace webkit_glue {
 struct WebIntentServiceData;
+}
 
 // Controls the creation of the WebIntentPicker UI and forwards the user's
 // intent handler choice back to the TabContents object.
 class WebIntentPickerController : public content::NotificationObserver,
                                   public WebIntentPickerDelegate {
  public:
   // Takes ownership of |factory|.
   WebIntentPickerController(TabContentsWrapper* wrapper,
                             WebIntentPickerFactory* factory);
   virtual ~WebIntentPickerController();
@@ skipping 26 matching lines @@
  private:
   friend class WebIntentPickerControllerTest;
   friend class WebIntentPickerControllerBrowserTest;
   class WebIntentDataFetcher;
   class FaviconFetcher;
 
   int pending_async_count() const { return pending_async_count_; }
 
   // Called from the WebIntentDataFetcher when intent data is available.
   void OnWebIntentDataAvailable(
-      const std::vector<WebIntentServiceData>& intent_data);
+      const std::vector<webkit_glue::WebIntentServiceData>& services);
 
   // Called from the FaviconDataFetcher when a favicon is available.
   void OnFaviconDataAvailable(size_t index, const SkBitmap& icon_bitmap);
 
   // Called from the FaviconDataFetcher when a favicon is not available.
   void OnFaviconDataUnavailable(size_t index);
 
   // Closes the currently active picker.
   void ClosePicker();
 
@@ skipping 29 matching lines @@
   // The intent data from the client.
   webkit_glue::WebIntentData intent_;
 
   // The intent ID assigned to this intent by the renderer.
   int intent_id_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_