Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: base/sys_info_unittest.cc

Issue 468253002: Move file_util to base/files/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Forgot to add forwarding header to patch Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/sys_info_posix.cc ('k') | base/test/gtest_xml_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/environment.h" 5 #include "base/environment.h"
6 #include "base/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/sys_info.h" 7 #include "base/sys_info.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "testing/platform_test.h" 11 #include "testing/platform_test.h"
12 12
13 typedef PlatformTest SysInfoTest; 13 typedef PlatformTest SysInfoTest;
14 using base::FilePath; 14 using base::FilePath;
15 15
16 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) 16 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease2, base::Time()); 139 base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease2, base::Time());
140 EXPECT_TRUE(base::SysInfo::IsRunningOnChromeOS()); 140 EXPECT_TRUE(base::SysInfo::IsRunningOnChromeOS());
141 141
142 const char* kLsbRelease3 = 142 const char* kLsbRelease3 =
143 "CHROMEOS_RELEASE_NAME=Chromium OS\n"; 143 "CHROMEOS_RELEASE_NAME=Chromium OS\n";
144 base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease3, base::Time()); 144 base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease3, base::Time());
145 EXPECT_TRUE(base::SysInfo::IsRunningOnChromeOS()); 145 EXPECT_TRUE(base::SysInfo::IsRunningOnChromeOS());
146 } 146 }
147 147
148 #endif // OS_CHROMEOS 148 #endif // OS_CHROMEOS
OLDNEW
« no previous file with comments | « base/sys_info_posix.cc ('k') | base/test/gtest_xml_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698