[BTM] Rename files/directories prefixed with "dips" to "btm".
Fixed: 399868999
Change-Id: Ibef87018728bad5e5deafbf4a76a25b6b08dba8d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6309330
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: Adam Langley <[email protected]>
Commit-Queue: Ryan Tarpine <[email protected]>
Reviewed-by: Ben Kelly <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1426513}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 26ee4a8..3740daf 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -274,6 +274,12 @@
"browsing_data/site_data_size_collector.h",
"browsing_topics/browsing_topics_service_factory.cc",
"browsing_topics/browsing_topics_service_factory.h",
+ "btm/btm_browser_signin_detector.cc",
+ "btm/btm_browser_signin_detector.h",
+ "btm/btm_browser_signin_detector_factory.cc",
+ "btm/btm_browser_signin_detector_factory.h",
+ "btm/stateful_bounce_counter.cc",
+ "btm/stateful_bounce_counter.h",
"chained_back_navigation_tracker.cc",
"chained_back_navigation_tracker.h",
"child_process_host_flags.h",
@@ -387,12 +393,6 @@
"digital_credentials/digital_identity_interstitial_closed_reason.h",
"digital_credentials/digital_identity_low_risk_origins.cc",
"digital_credentials/digital_identity_low_risk_origins.h",
- "dips/dips_browser_signin_detector.cc",
- "dips/dips_browser_signin_detector.h",
- "dips/dips_browser_signin_detector_factory.cc",
- "dips/dips_browser_signin_detector_factory.h",
- "dips/stateful_bounce_counter.cc",
- "dips/stateful_bounce_counter.h",
"display_capture/captured_surface_control_permission_context.cc",
"display_capture/captured_surface_control_permission_context.h",
"display_capture/display_capture_permission_context.cc",
diff --git a/chrome/browser/dips/BUILD.gn b/chrome/browser/btm/BUILD.gn
similarity index 86%
rename from chrome/browser/dips/BUILD.gn
rename to chrome/browser/btm/BUILD.gn
index 3bd984e5..a18c059c 100644
--- a/chrome/browser/dips/BUILD.gn
+++ b/chrome/browser/btm/BUILD.gn
@@ -4,7 +4,7 @@
source_set("unit_tests") {
testonly = true
- sources = [ "dips_browser_signin_detector_unittest.cc" ]
+ sources = [ "btm_browser_signin_detector_unittest.cc" ]
deps = [
"//base",
diff --git a/chrome/browser/dips/DIR_METADATA b/chrome/browser/btm/DIR_METADATA
similarity index 100%
rename from chrome/browser/dips/DIR_METADATA
rename to chrome/browser/btm/DIR_METADATA
diff --git a/chrome/browser/dips/OWNERS b/chrome/browser/btm/OWNERS
similarity index 100%
rename from chrome/browser/dips/OWNERS
rename to chrome/browser/btm/OWNERS
diff --git a/chrome/browser/dips/README.md b/chrome/browser/btm/README.md
similarity index 100%
rename from chrome/browser/dips/README.md
rename to chrome/browser/btm/README.md
diff --git a/chrome/browser/dips/dips_browser_signin_detector.cc b/chrome/browser/btm/btm_browser_signin_detector.cc
similarity index 96%
rename from chrome/browser/dips/dips_browser_signin_detector.cc
rename to chrome/browser/btm/btm_browser_signin_detector.cc
index 67b1b8d..8097e23 100644
--- a/chrome/browser/dips/dips_browser_signin_detector.cc
+++ b/chrome/browser/btm/btm_browser_signin_detector.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dips/dips_browser_signin_detector.h"
+#include "chrome/browser/btm/btm_browser_signin_detector.h"
#include <cstddef>
@@ -15,7 +15,7 @@
#include "components/signin/public/identity_manager/identity_manager.h"
#include "components/signin/public/identity_manager/signin_constants.h"
#include "content/public/browser/browser_context.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
using signin::constants::kNoHostedDomainFound;
diff --git a/chrome/browser/dips/dips_browser_signin_detector.h b/chrome/browser/btm/btm_browser_signin_detector.h
similarity index 91%
rename from chrome/browser/dips/dips_browser_signin_detector.h
rename to chrome/browser/btm/btm_browser_signin_detector.h
index 32028fb..cb07f2c 100644
--- a/chrome/browser/dips/dips_browser_signin_detector.h
+++ b/chrome/browser/btm/btm_browser_signin_detector.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DIPS_DIPS_BROWSER_SIGNIN_DETECTOR_H_
-#define CHROME_BROWSER_DIPS_DIPS_BROWSER_SIGNIN_DETECTOR_H_
+#ifndef CHROME_BROWSER_BTM_BTM_BROWSER_SIGNIN_DETECTOR_H_
+#define CHROME_BROWSER_BTM_BTM_BROWSER_SIGNIN_DETECTOR_H_
#include "base/memory/raw_ptr.h"
#include "base/types/pass_key.h"
@@ -16,7 +16,7 @@
namespace content {
class BrowserContext;
class BtmService;
-}
+} // namespace content
// BtmBrowserSigninDetector is a service because it depends on both BtmService
// and IdentityManager. We need to be sure it gets shutdown before them.
@@ -57,4 +57,4 @@
scoped_observation_{this};
};
-#endif // CHROME_BROWSER_DIPS_DIPS_BROWSER_SIGNIN_DETECTOR_H_
+#endif // CHROME_BROWSER_BTM_BTM_BROWSER_SIGNIN_DETECTOR_H_
diff --git a/chrome/browser/dips/dips_browser_signin_detector_factory.cc b/chrome/browser/btm/btm_browser_signin_detector_factory.cc
similarity index 93%
rename from chrome/browser/dips/dips_browser_signin_detector_factory.cc
rename to chrome/browser/btm/btm_browser_signin_detector_factory.cc
index a357185..40fa4c11 100644
--- a/chrome/browser/dips/dips_browser_signin_detector_factory.cc
+++ b/chrome/browser/btm/btm_browser_signin_detector_factory.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dips/dips_browser_signin_detector_factory.h"
+#include "chrome/browser/btm/btm_browser_signin_detector_factory.h"
+#include "chrome/browser/btm/btm_browser_signin_detector.h"
#include "chrome/browser/chrome_content_browser_client.h"
-#include "chrome/browser/dips/dips_browser_signin_detector.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/common/content_features.h"
/*static*/
diff --git a/chrome/browser/dips/dips_browser_signin_detector_factory.h b/chrome/browser/btm/btm_browser_signin_detector_factory.h
similarity index 84%
rename from chrome/browser/dips/dips_browser_signin_detector_factory.h
rename to chrome/browser/btm/btm_browser_signin_detector_factory.h
index a1de783..dcc596f 100644
--- a/chrome/browser/dips/dips_browser_signin_detector_factory.h
+++ b/chrome/browser/btm/btm_browser_signin_detector_factory.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DIPS_DIPS_BROWSER_SIGNIN_DETECTOR_FACTORY_H_
-#define CHROME_BROWSER_DIPS_DIPS_BROWSER_SIGNIN_DETECTOR_FACTORY_H_
+#ifndef CHROME_BROWSER_BTM_BTM_BROWSER_SIGNIN_DETECTOR_FACTORY_H_
+#define CHROME_BROWSER_BTM_BTM_BROWSER_SIGNIN_DETECTOR_FACTORY_H_
#include <map>
#include <memory>
#include "base/run_loop.h"
#include "base/types/pass_key.h"
-#include "chrome/browser/dips/dips_browser_signin_detector.h"
+#include "chrome/browser/btm/btm_browser_signin_detector.h"
#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
class KeyedService;
@@ -48,4 +48,4 @@
context_runloops_for_testing_;
};
-#endif // CHROME_BROWSER_DIPS_DIPS_BROWSER_SIGNIN_DETECTOR_FACTORY_H_
+#endif // CHROME_BROWSER_BTM_BTM_BROWSER_SIGNIN_DETECTOR_FACTORY_H_
diff --git a/chrome/browser/dips/dips_browser_signin_detector_unittest.cc b/chrome/browser/btm/btm_browser_signin_detector_unittest.cc
similarity index 97%
rename from chrome/browser/dips/dips_browser_signin_detector_unittest.cc
rename to chrome/browser/btm/btm_browser_signin_detector_unittest.cc
index 3a05531..01ebb39 100644
--- a/chrome/browser/dips/dips_browser_signin_detector_unittest.cc
+++ b/chrome/browser/btm/btm_browser_signin_detector_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dips/dips_browser_signin_detector.h"
+#include "chrome/browser/btm/btm_browser_signin_detector.h"
#include <cstddef>
#include <cstring>
@@ -17,7 +17,7 @@
#include "base/test/scoped_feature_list.h"
#include "base/test/test_file_util.h"
#include "base/test/test_future.h"
-#include "chrome/browser/dips/dips_browser_signin_detector_factory.h"
+#include "chrome/browser/btm/btm_browser_signin_detector_factory.h"
#include "chrome/browser/signin/chrome_signin_client_factory.h"
#include "chrome/browser/signin/chrome_signin_client_test_util.h"
#include "chrome/browser/signin/identity_test_environment_profile_adaptor.h"
@@ -27,7 +27,7 @@
#include "components/signin/public/identity_manager/account_info.h"
#include "components/signin/public/identity_manager/account_managed_status_finder.h"
#include "components/signin/public/identity_manager/identity_test_environment.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/common/content_features.h"
#include "content/public/test/browser_task_environment.h"
#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
diff --git a/chrome/browser/dips/dips_devtools_browsertest.cc b/chrome/browser/btm/btm_devtools_browsertest.cc
similarity index 100%
rename from chrome/browser/dips/dips_devtools_browsertest.cc
rename to chrome/browser/btm/btm_devtools_browsertest.cc
diff --git a/chrome/browser/dips/stateful_bounce_counter.cc b/chrome/browser/btm/stateful_bounce_counter.cc
similarity index 91%
rename from chrome/browser/dips/stateful_bounce_counter.cc
rename to chrome/browser/btm/stateful_bounce_counter.cc
index 91b2848..cbf1c057 100644
--- a/chrome/browser/dips/stateful_bounce_counter.cc
+++ b/chrome/browser/btm/stateful_bounce_counter.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/dips/stateful_bounce_counter.h"
+#include "chrome/browser/btm/stateful_bounce_counter.h"
#include <memory>
#include "components/content_settings/browser/page_specific_content_settings.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/browser/web_contents_user_data.h"
namespace dips {
diff --git a/chrome/browser/dips/stateful_bounce_counter.h b/chrome/browser/btm/stateful_bounce_counter.h
similarity index 84%
rename from chrome/browser/dips/stateful_bounce_counter.h
rename to chrome/browser/btm/stateful_bounce_counter.h
index 7f0e51fa..6189ca1 100644
--- a/chrome/browser/dips/stateful_bounce_counter.h
+++ b/chrome/browser/btm/stateful_bounce_counter.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_DIPS_STATEFUL_BOUNCE_COUNTER_H_
-#define CHROME_BROWSER_DIPS_STATEFUL_BOUNCE_COUNTER_H_
+#ifndef CHROME_BROWSER_BTM_STATEFUL_BOUNCE_COUNTER_H_
+#define CHROME_BROWSER_BTM_STATEFUL_BOUNCE_COUNTER_H_
#include "base/memory/raw_ptr.h"
#include "base/supports_user_data.h"
#include "base/types/pass_key.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
namespace dips {
@@ -40,4 +40,4 @@
} // namespace dips
-#endif // CHROME_BROWSER_DIPS_STATEFUL_BOUNCE_COUNTER_H_
+#endif // CHROME_BROWSER_BTM_STATEFUL_BOUNCE_COUNTER_H_
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f48857c..d8c81890 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -58,6 +58,8 @@
#include "chrome/browser/browsing_data/chrome_browsing_data_model_delegate.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
#include "chrome/browser/browsing_topics/browsing_topics_service_factory.h"
+#include "chrome/browser/btm/btm_browser_signin_detector.h"
+#include "chrome/browser/btm/stateful_bounce_counter.h"
#include "chrome/browser/captive_portal/captive_portal_service_factory.h"
#include "chrome/browser/child_process_host_flags.h"
#include "chrome/browser/chrome_browser_main_extra_parts_nacl_deprecation.h"
@@ -71,8 +73,6 @@
#include "chrome/browser/defaults.h"
#include "chrome/browser/device_api/device_service_impl.h"
#include "chrome/browser/device_api/managed_configuration_service.h"
-#include "chrome/browser/dips/dips_browser_signin_detector.h"
-#include "chrome/browser/dips/stateful_bounce_counter.h"
#include "chrome/browser/download/chrome_download_manager_delegate.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/enterprise/browser_management/management_service_factory.h"
diff --git a/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc b/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
index 7314f5f..27153d4 100644
--- a/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
+++ b/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
@@ -56,9 +56,9 @@
#include "components/infobars/core/infobar.h"
#include "components/infobars/core/infobar_delegate.h"
#include "components/privacy_sandbox/privacy_sandbox_attestations/privacy_sandbox_attestations.h"
+#include "content/public/browser/btm_redirect_info.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/dips_redirect_info.h"
-#include "content/public/browser/dips_service.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/page_navigator.h"
#include "content/public/browser/ssl_status.h"
@@ -67,7 +67,7 @@
#include "content/public/common/referrer.h"
#include "content/public/test/browser_test.h"
#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/dips_service_test_utils.h"
+#include "content/public/test/btm_service_test_utils.h"
#include "content/public/test/preloading_test_util.h"
#include "content/public/test/prerender_test_util.h"
#include "extensions/browser/api/extensions_api_client.h"
diff --git a/chrome/browser/devtools/protocol/storage_handler.cc b/chrome/browser/devtools/protocol/storage_handler.cc
index 28be935..71f1fb8 100644
--- a/chrome/browser/devtools/protocol/storage_handler.cc
+++ b/chrome/browser/devtools/protocol/storage_handler.cc
@@ -16,7 +16,7 @@
#include "chrome/browser/first_party_sets/first_party_sets_policy_service_factory.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/tpcd/metadata/manager_factory.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/browser/web_contents.h"
#include "net/first_party_sets/first_party_set_entry.h"
diff --git a/chrome/browser/devtools/protocol/system_info_handler.cc b/chrome/browser/devtools/protocol/system_info_handler.cc
index 714ce837..f83633b 100644
--- a/chrome/browser/devtools/protocol/system_info_handler.cc
+++ b/chrome/browser/devtools/protocol/system_info_handler.cc
@@ -6,8 +6,8 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/common/btm_utils.h"
#include "content/public/common/content_features.h"
-#include "content/public/common/dips_utils.h"
SystemInfoHandler::SystemInfoHandler(protocol::UberDispatcher* dispatcher) {
protocol::SystemInfo::Dispatcher::wire(dispatcher, this);
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 7097bf3..eb2c5b71 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -39,6 +39,7 @@
#include "chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager_factory.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h"
#include "chrome/browser/browsing_topics/browsing_topics_service_factory.h"
+#include "chrome/browser/btm/btm_browser_signin_detector_factory.h"
#include "chrome/browser/chrome_browser_main.h"
#include "chrome/browser/client_hints/client_hints_factory.h"
#include "chrome/browser/collaboration/collaboration_service_factory.h"
@@ -53,7 +54,6 @@
#include "chrome/browser/data_sharing/data_sharing_service_factory.h"
#include "chrome/browser/device_api/managed_configuration_api_factory.h"
#include "chrome/browser/device_reauth/chrome_device_authenticator_factory.h"
-#include "chrome/browser/dips/dips_browser_signin_detector_factory.h"
#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
#include "chrome/browser/domain_reliability/service_factory.h"
#include "chrome/browser/download/background_download_service_factory.h"
diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
index 32121ad..79fd0a45 100644
--- a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
+++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
@@ -35,7 +35,7 @@
#include "components/permissions/permission_request_id.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/runtime_feature_state/runtime_feature_state_document_data.h"
#include "content/public/browser/storage_partition.h"
diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc
index 91c2bf8..88a2072 100644
--- a/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc
+++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context_unittest.cc
@@ -35,7 +35,7 @@
#include "components/permissions/permission_util.h"
#include "components/permissions/test/mock_permission_prompt_factory.h"
#include "components/prefs/pref_service.h"
-#include "content/public/browser/dips_service.h"
+#include "content/public/browser/btm_service.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_features.h"
#include "content/public/test/browser_test_utils.h"
