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

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifest_test.cc

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, 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
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 "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 5 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
6 6
7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/common/chrome_paths.h" 13 #include "chrome/common/chrome_paths.h"
14 #include "extensions/common/extension_l10n_util.h" 14 #include "extensions/common/extension_l10n_util.h"
15 #include "extensions/common/test_util.h" 15 #include "extensions/common/test_util.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 17
18 using extensions::Extension; 18 using extensions::Extension;
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 testcase.location_, 273 testcase.location_,
274 testcase.flags_); 274 testcase.flags_);
275 break; 275 break;
276 case EXPECT_TYPE_SUCCESS: 276 case EXPECT_TYPE_SUCCESS:
277 LoadAndExpectSuccess(testcase.manifest_filename_.c_str(), 277 LoadAndExpectSuccess(testcase.manifest_filename_.c_str(),
278 testcase.location_, 278 testcase.location_,
279 testcase.flags_); 279 testcase.flags_);
280 break; 280 break;
281 } 281 }
282 } 282 }
OLDNEW
« no previous file with comments | « chrome/common/extensions/manifest_handlers/theme_handler.cc ('k') | chrome/common/extensions/manifest_url_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698