revert 128949 (and dependent 129252)

chrome/browser/extensions/extension_content_settings_apitest.cc

 // Copyright (c) 2012 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/utf_string_conversions.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_content_settings_api.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 85 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
                        DISABLED_ContentSettingsGetResourceIdentifiers) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   FilePath::CharType kFooPath[] = FILE_PATH_LITERAL("/plugins/foo.plugin");
   FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin");
   const char* kFooName = "Foo Plugin";
   const char* kBarName = "Bar Plugin";
   const webkit::npapi::PluginGroupDefinition kPluginDefinitions[] = {
-    { "foo", "Foo", kFooName, NULL, 0 },
+    { "foo", "Foo", kFooName, NULL, 0,
+      "http://example.com/foo" },
   };
 
   webkit::npapi::MockPluginList plugin_list(kPluginDefinitions,
                                             arraysize(kPluginDefinitions));
   plugin_list.AddPluginToLoad(
       webkit::WebPluginInfo(ASCIIToUTF16(kFooName),
                             FilePath(kFooPath),
                             ASCIIToUTF16("1.2.3"),
                             ASCIIToUTF16("foo")));
   plugin_list.AddPluginToLoad(
       webkit::WebPluginInfo(ASCIIToUTF16(kBarName),
                             FilePath(kBarPath),
                             ASCIIToUTF16("2.3.4"),
                             ASCIIToUTF16("bar")));
 
   std::vector<webkit::npapi::PluginGroup> groups;
   plugin_list.GetPluginGroups(true, &groups);
 
   GetResourceIdentifiersFunction::SetPluginGroupsForTesting(&groups);
 
   EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
       << message_;
 
   GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL);
 }