Revert of Cache --whitelisted-extension-id in SimpleFeature.

chrome/browser/extensions/test_extension_environment.cc

Index: chrome/browser/extensions/test_extension_environment.cc
diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc
index f8478fcbd9e66bc174d7e77d8c7df382dd2cc45d..8b5c30e406eaf85ed55813d0f190a608e98fda54 100644
--- a/chrome/browser/extensions/test_extension_environment.cc
+++ b/chrome/browser/extensions/test_extension_environment.cc
@@ -26,28 +26,6 @@
 namespace extensions {
 
 using content::BrowserThread;
-
-namespace {
-
-scoped_ptr<base::DictionaryValue> MakeExtensionManifest(
-    const base::Value& manifest_extra) {
-  scoped_ptr<base::DictionaryValue> manifest = DictionaryBuilder()
-                                                   .Set("name", "Extension")
-                                                   .Set("version", "1.0")
-                                                   .Set("manifest_version", 2)
-                                                   .Build();
-  const base::DictionaryValue* manifest_extra_dict;
-  if (manifest_extra.GetAsDictionary(&manifest_extra_dict)) {
-    manifest->MergeDictionary(manifest_extra_dict);
-  } else {
-    std::string manifest_json;
-    base::JSONWriter::Write(&manifest_extra, &manifest_json);
-    ADD_FAILURE() << "Expected dictionary; got \"" << manifest_json << "\"";
-  }
-  return manifest;
-}
-
-}  // namespace
 
 TestExtensionEnvironment::TestExtensionEnvironment()
     : profile_(new TestingProfile),
@@ -90,21 +68,22 @@
 
 const Extension* TestExtensionEnvironment::MakeExtension(
     const base::Value& manifest_extra) {
-  scoped_ptr<base::DictionaryValue> manifest =
-      MakeExtensionManifest(manifest_extra);
+  scoped_ptr<base::DictionaryValue> manifest = DictionaryBuilder()
+      .Set("name", "Extension")
+      .Set("version", "1.0")
+      .Set("manifest_version", 2)
+      .Build();
+  const base::DictionaryValue* manifest_extra_dict;
+  if (manifest_extra.GetAsDictionary(&manifest_extra_dict)) {
+    manifest->MergeDictionary(manifest_extra_dict);
+  } else {
+    std::string manifest_json;
+    base::JSONWriter::Write(&manifest_extra, &manifest_json);
+    ADD_FAILURE() << "Expected dictionary; got \"" << manifest_json << "\"";
+  }
+
   scoped_refptr<Extension> result =
       ExtensionBuilder().SetManifest(manifest.Pass()).Build();
-  GetExtensionService()->AddExtension(result.get());
-  return result.get();
-}
-
-const Extension* TestExtensionEnvironment::MakeExtension(
-    const base::Value& manifest_extra,
-    const std::string& id) {
-  scoped_ptr<base::DictionaryValue> manifest =
-      MakeExtensionManifest(manifest_extra);
-  scoped_refptr<Extension> result =
-      ExtensionBuilder().SetManifest(manifest.Pass()).SetID(id).Build();
   GetExtensionService()->AddExtension(result.get());
   return result.get();
 }