Commit c656c53e authored by Byoungkown's avatar Byoungkown Committed by Commit Bot

[Jumbo] Rename collision functions and enable jumbo build

GetPrefName function are collision with jumbo, so we need to change
name to avoid build fail with jumbo.
And enable jumbo build in components/content_settings/.
Use jumbo build after adding "use_jumbo_build=true" args in GN.

Bug: 869381
Change-Id: Ic45971922b4c34cb7deb48e246da145e752e5383
Reviewed-on: https://chromium-review.googlesource.com/1203478Reviewed-by: default avatarMartin Šrámek <msramek@chromium.org>
Commit-Queue: Byoungkwon Ko <codeimpl@gmail.com>
Cr-Commit-Position: refs/heads/master@{#589313}
parent 41caa7c4
......@@ -3,9 +3,10 @@
# found in the LICENSE file.
import("//build/config/features.gni")
import("//build/config/jumbo.gni")
import("//ppapi/buildflags/buildflags.gni")
static_library("browser") {
jumbo_static_library("browser") {
sources = [
"content_settings_default_provider.cc",
"content_settings_default_provider.h",
......@@ -67,7 +68,7 @@ static_library("browser") {
]
}
source_set("unit_tests") {
jumbo_source_set("unit_tests") {
testonly = true
sources = [
"content_settings_ephemeral_provider_unittest.cc",
......
......@@ -17,7 +17,7 @@ namespace {
const char kPrefPrefix[] = "profile.content_settings.exceptions.";
const char kDefaultPrefPrefix[] = "profile.default_content_setting_values.";
std::string GetPrefName(const std::string& name, const char* prefix) {
std::string GetPreferenceName(const std::string& name, const char* prefix) {
std::string pref_name = name;
base::ReplaceChars(pref_name, "-", "_", &pref_name);
return std::string(prefix).append(pref_name);
......@@ -37,8 +37,8 @@ WebsiteSettingsInfo::WebsiteSettingsInfo(
IncognitoBehavior incognito_behavior)
: type_(type),
name_(name),
pref_name_(GetPrefName(name, kPrefPrefix)),
default_value_pref_name_(GetPrefName(name, kDefaultPrefPrefix)),
pref_name_(GetPreferenceName(name, kPrefPrefix)),
default_value_pref_name_(GetPreferenceName(name, kDefaultPrefPrefix)),
initial_default_value_(std::move(initial_default_value)),
sync_status_(sync_status),
lossy_status_(lossy_status),
......
......@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/jumbo.gni")
import("//mojo/public/tools/bindings/mojom.gni")
static_library("common") {
jumbo_static_library("common") {
sources = [
"content_settings.cc",
"content_settings.h",
......@@ -34,7 +35,7 @@ static_library("common") {
]
}
source_set("unit_tests") {
jumbo_source_set("unit_tests") {
testonly = true
sources = [
"content_settings_pattern_parser_unittest.cc",
......
......@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
static_library("test_support") {
import("//build/config/jumbo.gni")
jumbo_static_library("test_support") {
testonly = true
sources = [
"content_settings_mock_provider.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment