chrome/common/extensions/permissions/settings_override_permission_unittest.cc - Issue 1548153002: Switch to standard integer types in chrome/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/extensions/permissions/settings_override_permission_unittest.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/permissions/permissions_data_unittest.cc ('k') | chrome/common/extensions/sync_type_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/permissions/settings_override_permission_unittest.cc

diff --git a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

index 7f95c1cb0dbc7f164d3d875f616d75568edd71ae..a20047ce6ba7b45723c1fffa25f67f9737c03bd0 100644

--- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

+++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc

@@ -4,9 +4,11 @@

// These tests make sure SettingsOverridePermission values are set correctly.

-#include "base/basictypes.h"

+#include <stdint.h>

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

+#include "build/build_config.h"

#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"

#include "extensions/common/manifest_constants.h"

#include "extensions/common/permissions/permission_message_test_util.h"

@@ -27,7 +29,7 @@ class SettingsOverridePermissionTest : public ChromeManifestTest {

kSearchProvider = 1 << 2,

};

- scoped_refptr<Extension> GetPermissionSet(uint32 flags) {

+ scoped_refptr<Extension> GetPermissionSet(uint32_t flags) {

base::DictionaryValue ext_manifest;

ext_manifest.SetString(manifest_keys::kName, "test");

ext_manifest.SetString(manifest_keys::kVersion, "0.1");