Add webkit_glue namespace. Improve some variable and test names.

chrome/browser/ui/webui/options/web_intents_settings_handler.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 "chrome/browser/ui/webui/options/web_intents_settings_handler.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
@@ skipping 98 matching lines @@
   while (!node->empty()) {
     WebIntentsTreeNode* cnode = node->GetChild(0);
     CHECK(cnode->Type() == WebIntentsTreeNode::TYPE_SERVICE);
     ServiceTreeNode* snode = static_cast<ServiceTreeNode*>(cnode);
     RemoveService(snode);
   }
   delete intents_tree_model_->Remove(node->parent(), node);
 }
 
 void WebIntentsSettingsHandler::RemoveService(ServiceTreeNode* snode) {
-  WebIntentServiceData service;
+  webkit_glue::WebIntentServiceData service;
   service.service_url = GURL(snode->ServiceUrl());
   service.action = snode->Action();
   string16 stype;
   if (snode->Types().GetString(0, &stype)) {
     service.type = stype;  // Really need to iterate here.
   }
   service.title = snode->ServiceName();
   LOG(INFO) << "Removing service " << snode->ServiceName()
             << " " << snode->ServiceUrl();
   web_intents_registry_->UnregisterIntentProvider(service);
@@ skipping 23 matching lines @@
                                         children);
 
   ListValue args;
   args.Append(parent == intents_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
       Value::CreateStringValue(intents_tree_model_->GetTreeNodeId(parent)));
   args.Append(children);
 
   web_ui_->CallJavascriptFunction("IntentsView.loadChildren", args);
 }