Move IndependentOTRProfileManager class to c/b/profiles.

IndependentOTRProfileManager is moved to chrome/browser/profiles. Bug: 1033903 Change-Id: I6464b2458c700d8b43cf89029209333eb27fb86f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977999 Reviewed-by: mark a. foltz <mfoltz@chromium.org> Reviewed-by: Colin Blundell <blundell@chromium.org> Reviewed-by: Mihai Sardarescu <msarda@chromium.org> Commit-Queue: Ramin Halavati <rhalavati@chromium.org> Cr-Commit-Position: refs/heads/master@{#727726}
Denger-Network · Dec 30, 2019 · f37738e · f37738e
1 parent b336c06
commit f37738e
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 13 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -3353,6 +3353,8 @@ jumbo_static_library("browser") {
       "profile_resetter/triggered_profile_resetter_factory.cc",
       "profile_resetter/triggered_profile_resetter_factory.h",
       "profile_resetter/triggered_profile_resetter_win.cc",
+      "profiles/independent_otr_profile_manager.cc",
+      "profiles/independent_otr_profile_manager.h",
       "profiles/profile_shortcut_manager.cc",
       "profiles/profile_shortcut_manager.h",
       "profiles/profile_window.cc",

diff --git a/chrome/browser/devtools/devtools_browser_context_manager.h b/chrome/browser/devtools/devtools_browser_context_manager.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/no_destructor.h"
-#include "chrome/browser/media/router/presentation/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 #include "content/public/browser/devtools_manager_delegate.h"
 
 class DevToolsBrowserContextManager : public BrowserListObserver {

diff --git a/chrome/browser/devtools/protocol/target_handler.h b/chrome/browser/devtools/protocol/target_handler.h
@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/devtools/protocol/forward.h"
 #include "chrome/browser/devtools/protocol/target.h"
-#include "chrome/browser/media/router/presentation/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "net/base/host_port_pair.h"

diff --git a/chrome/browser/media/offscreen_tab.h b/chrome/browser/media/offscreen_tab.h
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/media/router/presentation/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/geometry/size.h"

diff --git a/chrome/browser/media/router/BUILD.gn b/chrome/browser/media/router/BUILD.gn
@@ -102,8 +102,6 @@ static_library("router") {
       "mojo/media_router_mojo_metrics.h",
       "mojo/media_sink_service_status.cc",
       "mojo/media_sink_service_status.h",
-      "presentation/independent_otr_profile_manager.cc",
-      "presentation/independent_otr_profile_manager.h",
       "presentation/presentation_navigation_policy.cc",
       "presentation/presentation_navigation_policy.h",
       "providers/cast/activity_record.cc",

diff --git a/chrome/browser/profiles/OWNERS b/chrome/browser/profiles/OWNERS
@@ -9,6 +9,9 @@ skuhne@chromium.org
 mmenke@chromium.org
 rch@chromium.org
 
+per-file independent_otr_profile_manager*=mfoltz@chromium.org
+per-file independent_otr_profile_manager*=btolsch@chromium.org
+
 per-file incognito_mode_policy_handler*=atwilson@chromium.org
 
 per-file host_zoom_map_browsertest.cc=wjmaclean@chromium.org

diff --git a/...tation/independent_otr_profile_manager.cc → ...ofiles/independent_otr_profile_manager.cc b/...tation/independent_otr_profile_manager.cc → ...ofiles/independent_otr_profile_manager.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/media/router/presentation/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 
 #include <algorithm>
 #include <utility>

diff --git a/...ntation/independent_otr_profile_manager.h → ...rofiles/independent_otr_profile_manager.h b/...ntation/independent_otr_profile_manager.h → ...rofiles/independent_otr_profile_manager.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_MEDIA_ROUTER_PRESENTATION_INDEPENDENT_OTR_PROFILE_MANAGER_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_INDEPENDENT_OTR_PROFILE_MANAGER_H_
+#ifndef CHROME_BROWSER_PROFILES_INDEPENDENT_OTR_PROFILE_MANAGER_H_
+#define CHROME_BROWSER_PROFILES_INDEPENDENT_OTR_PROFILE_MANAGER_H_
 
 #include <cstdint>
 #include <memory>
@@ -101,4 +101,4 @@ class IndependentOTRProfileManager final : public BrowserListObserver,
   DISALLOW_COPY_AND_ASSIGN(IndependentOTRProfileManager);
 };
 
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_PRESENTATION_INDEPENDENT_OTR_PROFILE_MANAGER_H_
+#endif  // CHROME_BROWSER_PROFILES_INDEPENDENT_OTR_PROFILE_MANAGER_H_
diff --git a/...endent_otr_profile_manager_browsertest.cc → ...endent_otr_profile_manager_browsertest.cc b/...endent_otr_profile_manager_browsertest.cc → ...endent_otr_profile_manager_browsertest.cc
@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/browser/media/router/presentation/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_observer.h"
 #include "chrome/browser/ui/browser.h"

diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
@@ -10,9 +10,9 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "chrome/browser/media/router/presentation/independent_otr_profile_manager.h"
 #include "chrome/browser/media/router/presentation/presentation_navigation_policy.h"
 #include "chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 #include "chrome/browser/ui/media_router/presentation_receiver_window_delegate.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"

diff --git a/chrome/browser/ui/views/hats/hats_web_dialog.h b/chrome/browser/ui/views/hats/hats_web_dialog.h
@@ -10,7 +10,7 @@
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/media/router/presentation/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/independent_otr_profile_manager.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
 class Browser;

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -959,7 +959,6 @@ if (!is_android) {
       "../browser/media/media_browsertest.h",
       "../browser/media/media_engagement_autoplay_browsertest.cc",
       "../browser/media/media_engagement_browsertest.cc",
-      "../browser/media/router/presentation/independent_otr_profile_manager_browsertest.cc",
       "../browser/media/test_license_server.cc",
       "../browser/media/test_license_server.h",
       "../browser/media/test_license_server_config.h",
@@ -1117,6 +1116,7 @@ if (!is_android) {
       "../browser/process_singleton_browsertest.cc",
       "../browser/profile_resetter/profile_resetter_browsertest.cc",
       "../browser/profiles/host_zoom_map_browsertest.cc",
+      "../browser/profiles/independent_otr_profile_manager_browsertest.cc",
       "../browser/profiles/profile_browsertest.cc",
       "../browser/profiles/profile_list_desktop_browsertest.cc",
       "../browser/profiles/profile_manager_browsertest.cc",