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

Side by Side Diff: chrome/common/mac/app_mode_chrome_locator_unittest.mm

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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 | « chrome/common/logging_chrome.cc ('k') | chrome/common/mac/app_mode_common.mm » ('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 #import "chrome/common/mac/app_mode_chrome_locator.h" 5 #import "chrome/common/mac/app_mode_chrome_locator.h"
6 6
7 #include <CoreFoundation/CoreFoundation.h> 7 #include <CoreFoundation/CoreFoundation.h>
8 8
9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "chrome/common/chrome_constants.h" 13 #include "chrome/common/chrome_constants.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace { 16 namespace {
17 17
18 // Return the path to the Chrome/Chromium app bundle compiled along with the 18 // Return the path to the Chrome/Chromium app bundle compiled along with the
19 // test executable. 19 // test executable.
20 void GetChromeBundlePath(base::FilePath* chrome_bundle) { 20 void GetChromeBundlePath(base::FilePath* chrome_bundle) {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 base::string16 raw_version; 62 base::string16 raw_version;
63 base::FilePath version_path; 63 base::FilePath version_path;
64 base::FilePath framework_path; 64 base::FilePath framework_path;
65 EXPECT_TRUE(GetChromeBundleInfo(chrome_bundle_path, 65 EXPECT_TRUE(GetChromeBundleInfo(chrome_bundle_path,
66 &executable_path, &raw_version, &version_path, &framework_path)); 66 &executable_path, &raw_version, &version_path, &framework_path));
67 EXPECT_TRUE(base::PathExists(executable_path)); 67 EXPECT_TRUE(base::PathExists(executable_path));
68 EXPECT_GT(raw_version.size(), 0U); 68 EXPECT_GT(raw_version.size(), 0U);
69 EXPECT_TRUE(base::DirectoryExists(version_path)); 69 EXPECT_TRUE(base::DirectoryExists(version_path));
70 EXPECT_TRUE(base::PathExists(framework_path)); 70 EXPECT_TRUE(base::PathExists(framework_path));
71 } 71 }
OLDNEW
« no previous file with comments | « chrome/common/logging_chrome.cc ('k') | chrome/common/mac/app_mode_common.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698