Skip to content

GitLab

T
tangled
Commit 289815c7 authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot
Browse files
Options

Move safe sites filtering out of experimental directory 

This code is used since 2014 and it should not be considered
experimental.

Bug: b/145953755
Change-Id: If378a9c93edbc33d50d93b0ae9bb86ad19db1057
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003573Reviewed-by: default avatarYilkal Abe <yilkal@chromium.org>
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736063}
parent b5353b02
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 18 deletions
chrome/browser/BUILD.gn
View file @ 289815c7
...@@ -5208,10 +5208,6 @@ jumbo_static_library("browser") { ...@@ -5208,10 +5208,6 @@ jumbo_static_library("browser") {
"supervised_user/child_accounts/kids_management_api.h", "supervised_user/child_accounts/kids_management_api.h",
"supervised_user/child_accounts/permission_request_creator_apiary.cc", "supervised_user/child_accounts/permission_request_creator_apiary.cc",
"supervised_user/child_accounts/permission_request_creator_apiary.h", "supervised_user/child_accounts/permission_request_creator_apiary.h",
"supervised_user/experimental/supervised_user_blacklist.cc",
"supervised_user/experimental/supervised_user_blacklist.h",
"supervised_user/experimental/supervised_user_filtering_switches.cc",
"supervised_user/experimental/supervised_user_filtering_switches.h",
"supervised_user/kids_chrome_management/kids_chrome_management_client.cc", "supervised_user/kids_chrome_management/kids_chrome_management_client.cc",
"supervised_user/kids_chrome_management/kids_chrome_management_client.h", "supervised_user/kids_chrome_management/kids_chrome_management_client.h",
"supervised_user/kids_chrome_management/kids_chrome_management_client_factory.cc", "supervised_user/kids_chrome_management/kids_chrome_management_client_factory.cc",
...@@ -5219,10 +5215,14 @@ jumbo_static_library("browser") { ...@@ -5219,10 +5215,14 @@ jumbo_static_library("browser") {
"supervised_user/kids_management_url_checker_client.cc", "supervised_user/kids_management_url_checker_client.cc",
"supervised_user/kids_management_url_checker_client.h", "supervised_user/kids_management_url_checker_client.h",
"supervised_user/permission_request_creator.h", "supervised_user/permission_request_creator.h",
"supervised_user/supervised_user_blacklist.cc",
"supervised_user/supervised_user_blacklist.h",
"supervised_user/supervised_user_constants.cc", "supervised_user/supervised_user_constants.cc",
"supervised_user/supervised_user_constants.h", "supervised_user/supervised_user_constants.h",
"supervised_user/supervised_user_features.cc", "supervised_user/supervised_user_features.cc",
"supervised_user/supervised_user_features.h", "supervised_user/supervised_user_features.h",
"supervised_user/supervised_user_filtering_switches.cc",
"supervised_user/supervised_user_filtering_switches.h",
"supervised_user/supervised_user_google_auth_navigation_throttle.cc", "supervised_user/supervised_user_google_auth_navigation_throttle.cc",
"supervised_user/supervised_user_google_auth_navigation_throttle.h", "supervised_user/supervised_user_google_auth_navigation_throttle.h",
"supervised_user/supervised_user_interstitial.cc", "supervised_user/supervised_user_interstitial.cc",
......
chrome/browser/supervised_user/experimental/supervised_user_blacklist.cc → chrome/browser/supervised_user/supervised_user_blacklist.cc
View file @ 289815c7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.h" #include "chrome/browser/supervised_user/supervised_user_blacklist.h"
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
...@@ -33,8 +33,7 @@ ReadFromBinaryFileOnFileThread(const base::FilePath& path) { ...@@ -33,8 +33,7 @@ ReadFromBinaryFileOnFileThread(const base::FilePath& path) {
host_hashes->resize(hash_count); host_hashes->resize(hash_count);
for (size_t i = 0; i < hash_count; i++) { for (size_t i = 0; i < hash_count; i++) {
memcpy((*host_hashes.get())[i].data, memcpy((*host_hashes.get())[i].data, file.data() + i * base::kSHA1Length,
file.data() + i * base::kSHA1Length,
base::kSHA1Length); base::kSHA1Length);
} }
...@@ -43,7 +42,7 @@ ReadFromBinaryFileOnFileThread(const base::FilePath& path) { ...@@ -43,7 +42,7 @@ ReadFromBinaryFileOnFileThread(const base::FilePath& path) {
return host_hashes; return host_hashes;
} }
} // namespace } // namespace
SupervisedUserBlacklist::Hash::Hash(const std::string& host) { SupervisedUserBlacklist::Hash::Hash(const std::string& host) {
const unsigned char* host_bytes = const unsigned char* host_bytes =
......
chrome/browser/supervised_user/experimental/supervised_user_blacklist.h → chrome/browser/supervised_user/supervised_user_blacklist.h
View file @ 289815c7
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_SUPERVISED_USER_EXPERIMENTAL_SUPERVISED_USER_BLACKLIST_H_ #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_BLACKLIST_H_
#define CHROME_BROWSER_SUPERVISED_USER_EXPERIMENTAL_SUPERVISED_USER_BLACKLIST_H_ #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_BLACKLIST_H_
#include <stddef.h> #include <stddef.h>
...@@ -58,4 +58,4 @@ class SupervisedUserBlacklist { ...@@ -58,4 +58,4 @@ class SupervisedUserBlacklist {
DISALLOW_COPY_AND_ASSIGN(SupervisedUserBlacklist); DISALLOW_COPY_AND_ASSIGN(SupervisedUserBlacklist);
}; };
#endif // CHROME_BROWSER_SUPERVISED_USER_EXPERIMENTAL_SUPERVISED_USER_BLACKLIST_H_ #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_BLACKLIST_H_
chrome/browser/supervised_user/experimental/supervised_user_filtering_switches.cc → chrome/browser/supervised_user/supervised_user_filtering_switches.cc
View file @ 289815c7
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/supervised_user/experimental/supervised_user_filtering_switches.h" #include "chrome/browser/supervised_user/supervised_user_filtering_switches.h"
#include "base/command_line.h" #include "base/command_line.h"
#include "base/metrics/field_trial.h" #include "base/metrics/field_trial.h"
......
chrome/browser/supervised_user/experimental/supervised_user_filtering_switches.h → chrome/browser/supervised_user/supervised_user_filtering_switches.h
View file @ 289815c7
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_SUPERVISED_USER_EXPERIMENTAL_SUPERVISED_USER_FILTERING_SWITCHES_H_ #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_FILTERING_SWITCHES_H_
#define CHROME_BROWSER_SUPERVISED_USER_EXPERIMENTAL_SUPERVISED_USER_FILTERING_SWITCHES_H_ #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_FILTERING_SWITCHES_H_
class Profile; class Profile;
...@@ -16,4 +16,4 @@ bool IsSafeSitesOnlineCheckEnabled(const Profile* profile); ...@@ -16,4 +16,4 @@ bool IsSafeSitesOnlineCheckEnabled(const Profile* profile);
} // namespace supervised_users } // namespace supervised_users
#endif // CHROME_BROWSER_SUPERVISED_USER_EXPERIMENTAL_SUPERVISED_USER_FILTERING_SWITCHES_H_ #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_FILTERING_SWITCHES_H_
chrome/browser/supervised_user/supervised_user_service.cc
View file @ 289815c7
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include "chrome/browser/component_updater/supervised_user_whitelist_installer.h" #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_key.h" #include "chrome/browser/profiles/profile_key.h"
#include "chrome/browser/supervised_user/experimental/supervised_user_filtering_switches.h"
#include "chrome/browser/supervised_user/permission_request_creator.h" #include "chrome/browser/supervised_user/permission_request_creator.h"
#include "chrome/browser/supervised_user/supervised_user_constants.h" #include "chrome/browser/supervised_user/supervised_user_constants.h"
#include "chrome/browser/supervised_user/supervised_user_features.h" #include "chrome/browser/supervised_user/supervised_user_features.h"
#include "chrome/browser/supervised_user/supervised_user_filtering_switches.h"
#include "chrome/browser/supervised_user/supervised_user_service_factory.h" #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
#include "chrome/browser/supervised_user/supervised_user_service_observer.h" #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
#include "chrome/browser/supervised_user/supervised_user_settings_service.h" #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
......
chrome/browser/supervised_user/supervised_user_service.h
View file @ 289815c7
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/net/file_downloader.h" #include "chrome/browser/net/file_downloader.h"
#include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.h" #include "chrome/browser/supervised_user/supervised_user_blacklist.h"
#include "chrome/browser/supervised_user/supervised_user_url_filter.h" #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
#include "chrome/browser/supervised_user/supervised_users.h" #include "chrome/browser/supervised_user/supervised_users.h"
#include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/browser_list_observer.h"
......
chrome/browser/supervised_user/supervised_user_url_filter.cc
View file @ 289815c7
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "base/task/post_task.h" #include "base/task/post_task.h"
#include "base/task_runner_util.h" #include "base/task_runner_util.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.h"
#include "chrome/browser/supervised_user/kids_management_url_checker_client.h" #include "chrome/browser/supervised_user/kids_management_url_checker_client.h"
#include "chrome/browser/supervised_user/supervised_user_blacklist.h"
#include "chrome/common/chrome_features.h" #include "chrome/common/chrome_features.h"
#include "components/policy/core/browser/url_blacklist_manager.h" #include "components/policy/core/browser/url_blacklist_manager.h"
#include "components/policy/core/browser/url_util.h" #include "components/policy/core/browser/url_util.h"
......
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