Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/ui/intents/web_intents_model.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_INTENTS_MODEL_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENTS_MODEL_H_
 #pragma once
 
 #include "base/values.h"
 #include "chrome/browser/intents/web_intents_registry.h"
@@ skipping 85 matching lines @@
 
   string16 GetTreeNodeId(WebIntentsTreeNode* node);
   WebIntentsTreeNode* GetTreeNode(std::string path_id);
   void GetChildNodeList(WebIntentsTreeNode* parent, int start, int count,
                         base::ListValue* nodes);
   void GetWebIntentsTreeNodeDictionary(const WebIntentsTreeNode& node,
                                        base::DictionaryValue* dict);
 
   virtual void OnIntentsQueryDone(
       WebIntentsRegistry::QueryID query_id,
-      const std::vector<WebIntentServiceData>& intents) OVERRIDE;
+      const std::vector<webkit_glue::WebIntentServiceData>& services) OVERRIDE;
 
  private:
   // Loads the data model from the WebIntentsRegistry.
   // TODO(gbillock): need an observer on that to absorb async updates?
   void LoadModel();
 
   // Do batch-specific notifies for updates coming from the LoadModel.
   void NotifyObserverBeginBatch();
   void NotifyObserverEndBatch();
 
   // The backing registry. Weak pointer.
   WebIntentsRegistry* intents_registry_;
 
   // Separate list of observers that'll get batch updates.
   ObserverList<Observer> intents_observer_list_;
 
   // Batch update nesting level. Incremented to indicate that we're in
   // the middle of a batch update.
   int batch_update_;
 };
 
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENTS_MODEL_H_