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

Side by Side Diff: chrome/browser/web_applications/web_app_mac_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
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/browser/web_applications/web_app_mac.h" 5 #import "chrome/browser/web_applications/web_app_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 #include <errno.h> 8 #include <errno.h>
9 #include <sys/xattr.h> 9 #include <sys/xattr.h>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/files/scoped_temp_dir.h" 13 #include "base/files/scoped_temp_dir.h"
14 #include "base/mac/foundation_util.h" 14 #include "base/mac/foundation_util.h"
15 #include "base/mac/scoped_nsobject.h" 15 #include "base/mac/scoped_nsobject.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/strings/sys_string_conversions.h" 17 #include "base/strings/sys_string_conversions.h"
18 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #import "chrome/common/mac/app_mode_common.h" 21 #import "chrome/common/mac/app_mode_common.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 [file_handler_1 objectForKey:app_mode::kCFBundleTypeRoleKey]); 344 [file_handler_1 objectForKey:app_mode::kCFBundleTypeRoleKey]);
345 NSArray* file_handler_1_extensions = 345 NSArray* file_handler_1_extensions =
346 [file_handler_1 objectForKey:app_mode::kCFBundleTypeExtensionsKey]; 346 [file_handler_1 objectForKey:app_mode::kCFBundleTypeExtensionsKey];
347 EXPECT_TRUE([file_handler_1_extensions containsObject:@"ext2"]); 347 EXPECT_TRUE([file_handler_1_extensions containsObject:@"ext2"]);
348 NSArray* file_handler_1_types = 348 NSArray* file_handler_1_types =
349 [file_handler_1 objectForKey:app_mode::kCFBundleTypeMIMETypesKey]; 349 [file_handler_1 objectForKey:app_mode::kCFBundleTypeMIMETypesKey];
350 EXPECT_TRUE([file_handler_1_types containsObject:@"type2"]); 350 EXPECT_TRUE([file_handler_1_types containsObject:@"type2"]);
351 } 351 }
352 352
353 } // namespace web_app 353 } // namespace web_app
OLDNEW
« no previous file with comments | « chrome/browser/web_applications/web_app_mac.mm ('k') | chrome/browser/web_applications/web_app_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698