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

Side by Side Diff: chrome/common/extensions/extension_unittest.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, 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/file_util.h" 5 #include "base/files/file_util.h"
6 #include "base/format_macros.h" 6 #include "base/format_macros.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
11 #include "chrome/common/extensions/command.h" 11 #include "chrome/common/extensions/command.h"
12 #include "chrome/common/extensions/extension_test_util.h" 12 #include "chrome/common/extensions/extension_test_util.h"
13 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" 13 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "components/crx_file/id_util.h" 15 #include "components/crx_file/id_util.h"
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 extension = LoadManifest("app", "manifest.json", Extension::FROM_BOOKMARK); 315 extension = LoadManifest("app", "manifest.json", Extension::FROM_BOOKMARK);
316 EXPECT_TRUE(extension->from_bookmark()); 316 EXPECT_TRUE(extension->from_bookmark());
317 317
318 extension = LoadManifest("app", "manifest.json", Extension::NO_FLAGS); 318 extension = LoadManifest("app", "manifest.json", Extension::NO_FLAGS);
319 EXPECT_FALSE(extension->from_bookmark()); 319 EXPECT_FALSE(extension->from_bookmark());
320 EXPECT_FALSE(extension->from_webstore()); 320 EXPECT_FALSE(extension->from_webstore());
321 } 321 }
322 322
323 } // namespace extensions 323 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698