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

Side by Side Diff: chrome/common/extensions/api/extension_api_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) 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 "extensions/common/extension_api.h" 5 #include "extensions/common/extension_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "extensions/common/extension.h" 20 #include "extensions/common/extension.h"
21 #include "extensions/common/extension_builder.h" 21 #include "extensions/common/extension_builder.h"
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 extension.get(), 927 extension.get(),
928 Feature::BLESSED_EXTENSION_CONTEXT, 928 Feature::BLESSED_EXTENSION_CONTEXT,
929 GURL()).is_available()); 929 GURL()).is_available());
930 EXPECT_FALSE(extension_api->IsAvailable("pageAction", 930 EXPECT_FALSE(extension_api->IsAvailable("pageAction",
931 extension.get(), 931 extension.get(),
932 Feature::BLESSED_EXTENSION_CONTEXT, 932 Feature::BLESSED_EXTENSION_CONTEXT,
933 GURL()).is_available()); 933 GURL()).is_available());
934 } 934 }
935 935
936 } // namespace extensions 936 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/chrome_paths_unittest.cc ('k') | chrome/common/extensions/api/i18n/default_locale_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698