oobe_config: Fix asan error with memory leak
From the API it seems like base::Environment::Create() returns a unique_ptr, but
even its unittests and some other examples are assuming it returns a raw pointer
and it seems like the implementation is also returns a raw pointer and that's
why we are getting a memory leak in the unittests. (Maybe we're still on an
older version of libchrome?!)
BUG=chromium:906228
TEST='USE=asan FEATURES=test emerge-edgar oobe_config'
Change-Id: I440cd379986350e8175f67eaa187d114aefa2c5d
Reviewed-on: https://chromium-review.googlesource.com/1340424
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
diff --git a/oobe_config/load_oobe_config_usb_test.cc b/oobe_config/load_oobe_config_usb_test.cc
index e297764..4bf0350 100644
--- a/oobe_config/load_oobe_config_usb_test.cc
+++ b/oobe_config/load_oobe_config_usb_test.cc
@@ -76,7 +76,8 @@
EXPECT_TRUE(base::CreateSymbolicLink(dev_id2, dev_id2_sym));
string source_path;
- base::Environment::Create()->GetVar("SRC", &source_path);
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
+ EXPECT_TRUE(env->GetVar("SRC", &source_path));
auto public_key = FilePath(source_path).Append("test.pub.key");
auto private_key = FilePath(source_path).Append("test.pri.key");
diff --git a/oobe_config/save_oobe_config_usb_test.cc b/oobe_config/save_oobe_config_usb_test.cc
index e609413..7febe58 100644
--- a/oobe_config/save_oobe_config_usb_test.cc
+++ b/oobe_config/save_oobe_config_usb_test.cc
@@ -66,7 +66,8 @@
strlen(dummy_domain));
string source_path;
- base::Environment::Create()->GetVar("SRC", &source_path);
+ std::unique_ptr<base::Environment> env(base::Environment::Create());
+ EXPECT_TRUE(env->GetVar("SRC", &source_path));
auto public_key = FilePath(source_path).Append("test.pub.key");
auto private_key = FilePath(source_path).Append("test.pri.key");
