Fix DictionaryValue leak in component_loader.cc

chrome/browser/extensions/component_loader_unittest.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 "chrome/browser/extensions/component_loader.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 116 matching lines @@
     base::FilePath test_data_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
     return test_data_dir.AppendASCII("extensions");
   }
 };
 
 TEST_F(ComponentLoaderTest, ParseManifest) {
   std::unique_ptr<base::DictionaryValue> manifest;
 
   // Test invalid JSON.
-  manifest.reset(
-      component_loader_.ParseManifest("{ 'test': 3 } invalid"));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("{ 'test': 3 } invalid");
+  EXPECT_FALSE(manifest);
 
   // Test manifests that are valid JSON, but don't have an object literal
   // at the root. ParseManifest() should always return NULL.
 
-  manifest.reset(component_loader_.ParseManifest(std::string()));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest(std::string());
+  EXPECT_FALSE(manifest);
 
-  manifest.reset(component_loader_.ParseManifest("[{ \"foo\": 3 }]"));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("[{ \"foo\": 3 }]");
+  EXPECT_FALSE(manifest);
 
-  manifest.reset(component_loader_.ParseManifest("\"Test\""));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("\"Test\"");
+  EXPECT_FALSE(manifest);
 
-  manifest.reset(component_loader_.ParseManifest("42"));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("42");
+  EXPECT_FALSE(manifest);
 
-  manifest.reset(component_loader_.ParseManifest("true"));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("true");
+  EXPECT_FALSE(manifest);
 
-  manifest.reset(component_loader_.ParseManifest("false"));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("false");
+  EXPECT_FALSE(manifest);
 
-  manifest.reset(component_loader_.ParseManifest("null"));
-  EXPECT_FALSE(manifest.get());
+  manifest = component_loader_.ParseManifest("null");
+  EXPECT_FALSE(manifest);
 
   // Test parsing valid JSON.
 
   int value = 0;
-  manifest.reset(component_loader_.ParseManifest(
-      "{ \"test\": { \"one\": 1 }, \"two\": 2 }"));
-  ASSERT_TRUE(manifest.get());
+  manifest = component_loader_.ParseManifest(
+      "{ \"test\": { \"one\": 1 }, \"two\": 2 }");
+  ASSERT_TRUE(manifest);
   EXPECT_TRUE(manifest->GetInteger("test.one", &value));
   EXPECT_EQ(1, value);
   ASSERT_TRUE(manifest->GetInteger("two", &value));
   EXPECT_EQ(2, value);
 
   std::string string_value;
-  manifest.reset(component_loader_.ParseManifest(manifest_contents_));
+  manifest = component_loader_.ParseManifest(manifest_contents_);
   ASSERT_TRUE(manifest->GetString("background.page", &string_value));
   EXPECT_EQ("backgroundpage.html", string_value);
 }
 
 // Test that the extension isn't loaded if the extension service isn't ready.
 TEST_F(ComponentLoaderTest, AddWhenNotReady) {
   extension_service_.set_ready(false);
   std::string extension_id =
       component_loader_.Add(manifest_contents_, extension_path_);
   EXPECT_NE("", extension_id);
@@ skipping 91 matching lines @@
   component_loader_.AddOrReplace(known_extension);
   EXPECT_EQ(default_count + 1, registry->enabled_extensions().size());
   EXPECT_EQ(1u, extension_service_.unloaded_count());
 
   // Add an invalid component extension.
   std::string extension_id = component_loader_.AddOrReplace(invalid_extension);
   EXPECT_TRUE(extension_id.empty());
 }
 
 }  // namespace extensions