| Index: base/environment_unittest.cc
|
| diff --git a/base/environment_unittest.cc b/base/environment_unittest.cc
|
| index f0577a8a82bbae73e9efb1cb33b66cd89448644e..774ab035ea647171072e704efe19a300dfeaa308 100644
|
| --- a/base/environment_unittest.cc
|
| +++ b/base/environment_unittest.cc
|
| @@ -86,43 +86,6 @@ TEST_F(EnvironmentTest, UnSetVar) {
|
| EXPECT_FALSE(env->HasVar(kFooUpper));
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| -
|
| -TEST_F(EnvironmentTest, AlterEnvironment) {
|
| - const wchar_t empty[] = L"\0";
|
| - const wchar_t a2[] = L"A=2\0";
|
| - EnvironmentMap changes;
|
| - string16 e;
|
| -
|
| - e = AlterEnvironment(empty, changes);
|
| - EXPECT_EQ(0, e[0]);
|
| -
|
| - changes[L"A"] = L"1";
|
| - e = AlterEnvironment(empty, changes);
|
| - EXPECT_EQ(string16(L"A=1\0\0", 5), e);
|
| -
|
| - changes.clear();
|
| - changes[L"A"] = string16();
|
| - e = AlterEnvironment(empty, changes);
|
| - EXPECT_EQ(string16(L"\0\0", 2), e);
|
| -
|
| - changes.clear();
|
| - e = AlterEnvironment(a2, changes);
|
| - EXPECT_EQ(string16(L"A=2\0\0", 5), e);
|
| -
|
| - changes.clear();
|
| - changes[L"A"] = L"1";
|
| - e = AlterEnvironment(a2, changes);
|
| - EXPECT_EQ(string16(L"A=1\0\0", 5), e);
|
| -
|
| - changes.clear();
|
| - changes[L"A"] = string16();
|
| - e = AlterEnvironment(a2, changes);
|
| - EXPECT_EQ(string16(L"\0\0", 2), e);
|
| -}
|
| -
|
| -#else
|
| -
|
| TEST_F(EnvironmentTest, AlterEnvironment) {
|
| const char* const empty[] = { NULL };
|
| const char* const a2[] = { "A=2", NULL };
|
| @@ -159,6 +122,4 @@ TEST_F(EnvironmentTest, AlterEnvironment) {
|
| EXPECT_TRUE(e[0] == NULL);
|
| }
|
|
|
| -#endif
|
| -
|
| } // namespace base
|
|
|