chrome/common/extensions/permissions/permission_set_unittest.cc - Issue 450053003: Use a qualified path for grit includes in various chrome/ directories.

Side by Side Diff: chrome/common/extensions/permissions/permission_set_unittest.cc

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove webkit strings that no longer exist 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

« no previous file with comments | « chrome/common/extensions/permissions/chrome_permission_message_provider.cc ('k') | chrome/common/importer/firefox_importer_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/json/json_file_value_serializer.h"	6 #include "base/json/json_file_value_serializer.h"

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/path_service.h"	8 #include "base/path_service.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "chrome/common/chrome_paths.h"	10 #include "chrome/common/chrome_paths.h"

11 #include "chrome/common/chrome_switches.h"	11 #include "chrome/common/chrome_switches.h"

12 #include "chrome/common/extensions/extension_test_util.h"	12 #include "chrome/common/extensions/extension_test_util.h"

13 #include "chrome/common/extensions/features/feature_channel.h"	13 #include "chrome/common/extensions/features/feature_channel.h"

14 #include "chrome/common/extensions/permissions/chrome_permission_message_provide r.h"	14 #include "chrome/common/extensions/permissions/chrome_permission_message_provide r.h"

	15 #include "chrome/grit/generated_resources.h"

15 #include "extensions/common/error_utils.h"	16 #include "extensions/common/error_utils.h"

16 #include "extensions/common/extension.h"	17 #include "extensions/common/extension.h"

17 #include "extensions/common/extension_builder.h"	18 #include "extensions/common/extension_builder.h"

18 #include "extensions/common/permissions/permission_message_provider.h"	19 #include "extensions/common/permissions/permission_message_provider.h"

19 #include "extensions/common/permissions/permission_message_util.h"	20 #include "extensions/common/permissions/permission_message_util.h"

20 #include "extensions/common/permissions/permission_set.h"	21 #include "extensions/common/permissions/permission_set.h"

21 #include "extensions/common/permissions/permissions_data.h"	22 #include "extensions/common/permissions/permissions_data.h"

22 #include "extensions/common/permissions/permissions_info.h"	23 #include "extensions/common/permissions/permissions_info.h"

23 #include "extensions/common/permissions/socket_permission.h"	24 #include "extensions/common/permissions/socket_permission.h"

24 #include "extensions/common/value_builder.h"	25 #include "extensions/common/value_builder.h"

25 #include "grit/extensions_strings.h"	26 #include "extensions/strings/grit/extensions_strings.h"

26 #include "grit/generated_resources.h"

27 #include "testing/gtest/include/gtest/gtest.h"	27 #include "testing/gtest/include/gtest/gtest.h"

28 #include "ui/base/l10n/l10n_util.h"	28 #include "ui/base/l10n/l10n_util.h"

29	29

30 using extension_test_util::LoadManifest;	30 using extension_test_util::LoadManifest;

31	31

32 namespace extensions {	32 namespace extensions {

33	33

34 namespace {	34 namespace {

35	35

36 static void AddPattern(URLPatternSet* extent, const std::string& pattern) {	36 static void AddPattern(URLPatternSet* extent, const std::string& pattern) {

(...skipping 1756 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1793 scoped_refptr<const PermissionSet> permissions_dwr(	1793 scoped_refptr<const PermissionSet> permissions_dwr(

1794 extension_dwr->permissions_data()->active_permissions());	1794 extension_dwr->permissions_data()->active_permissions());

1795	1795

1796 EXPECT_FALSE(PermissionMessageProvider::Get()->	1796 EXPECT_FALSE(PermissionMessageProvider::Get()->

1797 IsPrivilegeIncrease(permissions.get(),	1797 IsPrivilegeIncrease(permissions.get(),

1798 permissions_dwr.get(),	1798 permissions_dwr.get(),

1799 extension->GetType()));	1799 extension->GetType()));

1800 }	1800 }

1801	1801

1802 } // namespace extensions	1802 } // namespace extensions

OLD	NEW