Add webkit_glue namespace. Improve some variable and test names.

chrome/common/extensions/extension_manifests_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 "chrome/common/extensions/extension.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 817 matching lines @@
                      extension_manifest_errors::kInvalidIntentDisposition);
   LoadAndExpectError("intent_invalid_5.json",
                      extension_manifest_errors::kInvalidIntentType);
   LoadAndExpectError("intent_invalid_6.json",
                      extension_manifest_errors::kInvalidIntentTitle);
 
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("intent_valid.json"));
   ASSERT_TRUE(extension.get() != NULL);
 
-  ASSERT_EQ(1u, extension->intents().size());
-  EXPECT_EQ("image/png", UTF16ToUTF8(extension->intents()[0].type));
+  ASSERT_EQ(1u, extension->intents_services().size());
+  EXPECT_EQ("image/png", UTF16ToUTF8(extension->intents_services()[0].type));
   EXPECT_EQ("http://webintents.org/share",
-            UTF16ToUTF8(extension->intents()[0].action));
-  EXPECT_EQ("chrome-extension", extension->intents()[0].service_url.scheme());
-  EXPECT_EQ("///services/share", extension->intents()[0].service_url.path());
+            UTF16ToUTF8(extension->intents_services()[0].action));
+  EXPECT_EQ("chrome-extension",
+            extension->intents_services()[0].service_url.scheme());
+  EXPECT_EQ("///services/share",
+            extension->intents_services()[0].service_url.path());
   EXPECT_EQ("Sample Sharing Intent",
-            UTF16ToUTF8(extension->intents()[0].title));
-  EXPECT_EQ(WebIntentServiceData::DISPOSITION_INLINE,
-            extension->intents()[0].disposition);
+            UTF16ToUTF8(extension->intents_services()[0].title));
+  EXPECT_EQ(webkit_glue::WebIntentServiceData::DISPOSITION_INLINE,
+            extension->intents_services()[0].disposition);
 
   // Verify that optional fields are filled with defaults.
   extension = LoadAndExpectSuccess("intent_valid_minimal.json");
   ASSERT_TRUE(extension.get() != NULL);
 
-  ASSERT_EQ(1u, extension->intents().size());
-  EXPECT_EQ("", UTF16ToUTF8(extension->intents()[0].type));
+  ASSERT_EQ(1u, extension->intents_services().size());
+  EXPECT_EQ("", UTF16ToUTF8(extension->intents_services()[0].type));
   EXPECT_EQ("http://webintents.org/share",
-            UTF16ToUTF8(extension->intents()[0].action));
-  EXPECT_TRUE(extension->intents()[0].service_url.is_empty());
-  EXPECT_EQ("", UTF16ToUTF8(extension->intents()[0].title));
-  EXPECT_EQ(WebIntentServiceData::DISPOSITION_WINDOW,
-            extension->intents()[0].disposition);
+            UTF16ToUTF8(extension->intents_services()[0].action));
+  EXPECT_TRUE(extension->intents_services()[0].service_url.is_empty());
+  EXPECT_EQ("", UTF16ToUTF8(extension->intents_services()[0].title));
+  EXPECT_EQ(webkit_glue::WebIntentServiceData::DISPOSITION_WINDOW,
+            extension->intents_services()[0].disposition);
 }
 
 TEST_F(ExtensionManifestTest, ForbidPortsInPermissions) {
   // Loading as a user would shoud not trigger an error.
   LoadAndExpectSuccess("forbid_ports_in_permissions.json");
 
   // Ideally, loading as a developer would give an error.
   // To ensure that we do not error out on a valid permission
   // in a future version of chrome, validation is to loose
   // to flag this case.
@@ skipping 82 matching lines @@
   scoped_refptr<Extension> extension_2(
       LoadAndExpectSuccess("offline_disabled_packaged_app.json"));
   EXPECT_FALSE(extension_2->offline_enabled());
   scoped_refptr<Extension> extension_3(
       LoadAndExpectSuccess("offline_default_packaged_app.json"));
   EXPECT_FALSE(extension_3->offline_enabled());
   scoped_refptr<Extension> extension_4(
       LoadAndExpectSuccess("offline_enabled_hosted_app.json"));
   EXPECT_TRUE(extension_4->offline_enabled());
 }