summaryrefslogtreecommitdiff
path: root/chromium/base/environment_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-05-09 14:22:11 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-05-09 15:11:45 +0000
commit2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c (patch)
treee75f511546c5fd1a173e87c1f9fb11d7ac8d1af3 /chromium/base/environment_unittest.cc
parenta4f3d46271c57e8155ba912df46a05559d14726e (diff)
downloadqtwebengine-chromium-2ddb2d3e14eef3de7dbd0cef553d669b9ac2361c.tar.gz
BASELINE: Update Chromium to 51.0.2704.41
Also adds in all smaller components by reversing logic for exclusion. Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/base/environment_unittest.cc')
-rw-r--r--chromium/base/environment_unittest.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/base/environment_unittest.cc b/chromium/base/environment_unittest.cc
index 77e971787dd..ef264cf619f 100644
--- a/chromium/base/environment_unittest.cc
+++ b/chromium/base/environment_unittest.cc
@@ -3,7 +3,9 @@
// found in the LICENSE file.
#include "base/environment.h"
-#include "base/memory/scoped_ptr.h"
+
+#include <memory>
+
#include "build/build_config.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -14,14 +16,14 @@ namespace base {
TEST_F(EnvironmentTest, GetVar) {
// Every setup should have non-empty PATH...
- scoped_ptr<Environment> env(Environment::Create());
+ std::unique_ptr<Environment> env(Environment::Create());
std::string env_value;
EXPECT_TRUE(env->GetVar("PATH", &env_value));
EXPECT_NE(env_value, "");
}
TEST_F(EnvironmentTest, GetVarReverse) {
- scoped_ptr<Environment> env(Environment::Create());
+ std::unique_ptr<Environment> env(Environment::Create());
const char kFooUpper[] = "FOO";
const char kFooLower[] = "foo";
@@ -50,12 +52,12 @@ TEST_F(EnvironmentTest, GetVarReverse) {
TEST_F(EnvironmentTest, HasVar) {
// Every setup should have PATH...
- scoped_ptr<Environment> env(Environment::Create());
+ std::unique_ptr<Environment> env(Environment::Create());
EXPECT_TRUE(env->HasVar("PATH"));
}
TEST_F(EnvironmentTest, SetVar) {
- scoped_ptr<Environment> env(Environment::Create());
+ std::unique_ptr<Environment> env(Environment::Create());
const char kFooUpper[] = "FOO";
const char kFooLower[] = "foo";
@@ -70,7 +72,7 @@ TEST_F(EnvironmentTest, SetVar) {
}
TEST_F(EnvironmentTest, UnSetVar) {
- scoped_ptr<Environment> env(Environment::Create());
+ std::unique_ptr<Environment> env(Environment::Create());
const char kFooUpper[] = "FOO";
const char kFooLower[] = "foo";
@@ -128,7 +130,7 @@ TEST_F(EnvironmentTest, AlterEnvironment) {
const char* const empty[] = { NULL };
const char* const a2[] = { "A=2", NULL };
EnvironmentMap changes;
- scoped_ptr<char*[]> e;
+ std::unique_ptr<char* []> e;
e = AlterEnvironment(empty, changes);
EXPECT_TRUE(e[0] == NULL);