Rename chrome/browser/ui/views/feature_promos to in_product_help

This name is more discoverable and is consistent with
chrome/browser/ui/in_product_help.

Bug: 1106523
Change-Id: Ie611c9c25333ff349b8a2bc4c7110f6d1c047edd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332700Reviewed-by: Dana Fried <dfried@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794669}

chrome/browser/ui/BUILD.gn

@@ -3385,20 +3385,6 @@ static_library("ui") {
       "views/extensions/extensions_toolbar_button.h",
       "views/extensions/extensions_toolbar_container.cc",
       "views/extensions/extensions_toolbar_container.h",
-      "views/feature_promos/feature_promo_bubble_params.cc",
-      "views/feature_promos/feature_promo_bubble_params.h",
-      "views/feature_promos/feature_promo_bubble_timeout.cc",
-      "views/feature_promos/feature_promo_bubble_timeout.h",
-      "views/feature_promos/feature_promo_bubble_view.cc",
-      "views/feature_promos/feature_promo_bubble_view.h",
-      "views/feature_promos/feature_promo_colors.cc",
-      "views/feature_promos/feature_promo_colors.h",
-      "views/feature_promos/feature_promo_controller.cc",
-      "views/feature_promos/feature_promo_controller.h",
-      "views/feature_promos/global_media_controls_promo_controller.cc",
-      "views/feature_promos/global_media_controls_promo_controller.h",
-      "views/feature_promos/reopen_tab_promo_controller.cc",
-      "views/feature_promos/reopen_tab_promo_controller.h",
       "views/find_bar_host.cc",
       "views/find_bar_host.h",
       "views/find_bar_view.cc",
@@ -3482,6 +3468,20 @@ static_library("ui") {
       "views/hung_renderer_view.h",
       "views/importer/import_lock_dialog_view.cc",
       "views/importer/import_lock_dialog_view.h",
+      "views/in_product_help/feature_promo_bubble_params.cc",
+      "views/in_product_help/feature_promo_bubble_params.h",
+      "views/in_product_help/feature_promo_bubble_timeout.cc",
+      "views/in_product_help/feature_promo_bubble_timeout.h",
+      "views/in_product_help/feature_promo_bubble_view.cc",
+      "views/in_product_help/feature_promo_bubble_view.h",
+      "views/in_product_help/feature_promo_colors.cc",
+      "views/in_product_help/feature_promo_colors.h",
+      "views/in_product_help/feature_promo_controller.cc",
+      "views/in_product_help/feature_promo_controller.h",
+      "views/in_product_help/global_media_controls_promo_controller.cc",
+      "views/in_product_help/global_media_controls_promo_controller.h",
+      "views/in_product_help/reopen_tab_promo_controller.cc",
+      "views/in_product_help/reopen_tab_promo_controller.h",
       "views/infobars/alternate_nav_infobar_view.cc",
       "views/infobars/alternate_nav_infobar_view.h",
       "views/infobars/confirm_infobar.cc",

chrome/browser/ui/views/frame/browser_view.cc

@@ -88,7 +88,6 @@
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/extensions_toolbar_container.h"
 #include "chrome/browser/ui/views/eye_dropper/eye_dropper.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_controller.h"
 #include "chrome/browser/ui/views/find_bar_host.h"
 #include "chrome/browser/ui/views/frame/app_menu_button.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
@@ -104,6 +103,7 @@
 #include "chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h"
 #include "chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.h"
 #include "chrome/browser/ui/views/hats/hats_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/location_bar/intent_picker_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

chrome/browser/ui/views/frame/browser_view.h

@@ -29,13 +29,13 @@
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
-#include "chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 #include "chrome/browser/ui/views/frame/contents_web_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/top_controls_slide_controller.h"
 #include "chrome/browser/ui/views/frame/web_contents_close_handler.h"
+#include "chrome/browser/ui/views/in_product_help/reopen_tab_promo_controller.h"
 #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
 #include "chrome/browser/ui/views/load_complete_listener.h"
 #include "chrome/browser/ui/views/tabs/tab.h"

chrome/browser/ui/views/frame/webui_tab_strip_container_view.cc

@@ -35,11 +35,11 @@
 #include "chrome/browser/ui/ui_features.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/chrome_view_class_properties.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_colors.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_colors.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "chrome/browser/ui/views/toolbar/webui_tab_counter_button.h"

chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.cc

@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/global_media_controls/media_toolbar_button_controller.h"
 #include "chrome/browser/ui/in_product_help/global_media_controls_in_product_help.h"
 #include "chrome/browser/ui/in_product_help/global_media_controls_in_product_help_factory.h"
-#include "chrome/browser/ui/views/feature_promos/global_media_controls_promo_controller.h"
 #include "chrome/browser/ui/views/global_media_controls/media_dialog_view.h"
+#include "chrome/browser/ui/views/in_product_help/global_media_controls_promo_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/vector_icons/vector_icons.h"
 #include "media/base/media_switches.h"

chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.cc → chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
 
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.h"
 
 FeaturePromoBubbleParams::FeaturePromoBubbleParams() = default;
 FeaturePromoBubbleParams::~FeaturePromoBubbleParams() = default;

chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h → chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.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_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_PARAMS_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_PARAMS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_PARAMS_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_PARAMS_H_
 
 #include <memory>
 
@@ -65,4 +65,4 @@ struct FeaturePromoBubbleParams {
   std::unique_ptr<FeaturePromoBubbleTimeout> timeout;
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_PARAMS_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_PARAMS_H_

chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.cc → chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.h"
 
 #include <memory>
 
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 
 FeaturePromoBubbleTimeout::FeaturePromoBubbleTimeout(
     base::TimeDelta delay_default,

chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h → chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.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_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_TIMEOUT_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_TIMEOUT_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_TIMEOUT_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_TIMEOUT_H_
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
@@ -35,4 +35,4 @@ class FeaturePromoBubbleTimeout {
   DISALLOW_COPY_AND_ASSIGN(FeaturePromoBubbleTimeout);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_TIMEOUT_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_TIMEOUT_H_

chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.cc → chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.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/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 
 #include <memory>
 #include <utility>
@@ -11,8 +11,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.h"
 #include "components/variations/variations_associated_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"

chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h → chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_VIEW_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/timer/timer.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
 
@@ -63,4 +63,4 @@ class FeaturePromoBubbleView : public views::BubbleDialogDelegateView {
   DISALLOW_COPY_AND_ASSIGN(FeaturePromoBubbleView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_BUBBLE_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_BUBBLE_VIEW_H_

chrome/browser/ui/views/feature_promos/feature_promo_colors.cc → chrome/browser/ui/views/in_product_help/feature_promo_colors.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/ui/views/feature_promos/feature_promo_colors.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_colors.h"
 
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "ui/base/theme_provider.h"

chrome/browser/ui/views/feature_promos/feature_promo_colors.h → chrome/browser/ui/views/in_product_help/feature_promo_colors.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_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_COLORS_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_COLORS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_COLORS_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_COLORS_H_
 
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -14,4 +14,4 @@ class ThemeProvider;
 SkColor GetFeaturePromoHighlightColorForToolbar(
     const ui::ThemeProvider* theme_provider);
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_COLORS_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_COLORS_H_

chrome/browser/ui/views/feature_promos/feature_promo_controller.cc → chrome/browser/ui/views/in_product_help/feature_promo_controller.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/ui/views/feature_promos/feature_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 
 #include <utility>
 
@@ -11,8 +11,8 @@
 #include "chrome/browser/feature_engagement/tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/chrome_view_class_properties.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "components/feature_engagement/public/tracker.h"
 
 FeaturePromoController::FeaturePromoController(Profile* profile)

chrome/browser/ui/views/feature_promos/feature_promo_controller.h → chrome/browser/ui/views/in_product_help/feature_promo_controller.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_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_CONTROLLER_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_CONTROLLER_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_CONTROLLER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
@@ -112,4 +112,4 @@ class FeaturePromoController : public views::WidgetObserver {
   base::WeakPtrFactory<FeaturePromoController> weak_ptr_factory_{this};
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_FEATURE_PROMO_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_FEATURE_PROMO_CONTROLLER_H_

chrome/browser/ui/views/feature_promos/feature_promo_controller_unittest.cc → chrome/browser/ui/views/in_product_help/feature_promo_controller_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/ui/views/feature_promos/feature_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 
 #include "base/bind.h"
 #include "base/feature_list.h"
@@ -10,10 +10,10 @@
 #include "chrome/browser/feature_engagement/tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/chrome_view_class_properties.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/ui/views/feature_promos/feature_promo_dialog_browsertest.cc → chrome/browser/ui/views/in_product_help/feature_promo_dialog_browsertest.cc

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/test/test_browser_dialog.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/ui/views/feature_promos/global_media_controls_promo_controller.cc → chrome/browser/ui/views/in_product_help/global_media_controls_promo_controller.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/ui/views/feature_promos/global_media_controls_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/global_media_controls_promo_controller.h"
 
 #include <memory>
 #include <utility>
@@ -10,11 +10,11 @@
 #include "base/time/time.h"
 #include "chrome/browser/ui/in_product_help/global_media_controls_in_product_help.h"
 #include "chrome/browser/ui/in_product_help/global_media_controls_in_product_help_factory.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/generated_resources.h"
 

chrome/browser/ui/views/feature_promos/global_media_controls_promo_controller.h → chrome/browser/ui/views/in_product_help/global_media_controls_promo_controller.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_GLOBAL_MEDIA_CONTROLS_PROMO_CONTROLLER_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_GLOBAL_MEDIA_CONTROLS_PROMO_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_GLOBAL_MEDIA_CONTROLS_PROMO_CONTROLLER_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_GLOBAL_MEDIA_CONTROLS_PROMO_CONTROLLER_H_
 
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/global_media_controls/media_toolbar_button_observer.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ -68,4 +68,4 @@ class GlobalMediaControlsPromoController : public views::WidgetObserver,
   DISALLOW_COPY_AND_ASSIGN(GlobalMediaControlsPromoController);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_GLOBAL_MEDIA_CONTROLS_PROMO_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_GLOBAL_MEDIA_CONTROLS_PROMO_CONTROLLER_H_

chrome/browser/ui/views/feature_promos/global_media_controls_promo_controller_dialog_browsertest.cc → chrome/browser/ui/views/in_product_help/global_media_controls_promo_controller_dialog_browsertest.cc

@@ -7,9 +7,9 @@
 #include "base/test/test_mock_time_task_runner.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
-#include "chrome/browser/ui/views/feature_promos/global_media_controls_promo_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/global_media_controls/media_toolbar_button_view.h"
+#include "chrome/browser/ui/views/in_product_help/global_media_controls_promo_controller.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "content/public/test/browser_test.h"
 #include "media/base/media_switches.h"

chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller.cc → chrome/browser/ui/views/in_product_help/reopen_tab_promo_controller.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/ui/views/feature_promos/reopen_tab_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/reopen_tab_promo_controller.h"
 
 #include <memory>
 #include <utility>
@@ -14,10 +14,10 @@
 #include "chrome/browser/ui/in_product_help/reopen_tab_in_product_help.h"
 #include "chrome/browser/ui/in_product_help/reopen_tab_in_product_help_factory.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_timeout.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_timeout.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/toolbar/app_menu.h"
 #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"

chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller.h → chrome/browser/ui/views/in_product_help/reopen_tab_promo_controller.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_UI_VIEWS_FEATURE_PROMOS_REOPEN_TAB_PROMO_CONTROLLER_H_
-#define CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_REOPEN_TAB_PROMO_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_REOPEN_TAB_PROMO_CONTROLLER_H_
+#define CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_REOPEN_TAB_PROMO_CONTROLLER_H_
 
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/views/frame/app_menu_button_observer.h"
@@ -88,4 +88,4 @@ class ReopenTabPromoController : public AppMenuButtonObserver,
   DISALLOW_COPY_AND_ASSIGN(ReopenTabPromoController);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FEATURE_PROMOS_REOPEN_TAB_PROMO_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_IN_PRODUCT_HELP_REOPEN_TAB_PROMO_CONTROLLER_H_

chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller_dialog_browsertest.cc → chrome/browser/ui/views/in_product_help/reopen_tab_promo_controller_dialog_browsertest.cc

@@ -6,8 +6,8 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
-#include "chrome/browser/ui/views/feature_promos/reopen_tab_promo_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/in_product_help/reopen_tab_promo_controller.h"
 #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/test/base/ui_test_utils.h"

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

@@ -13,8 +13,8 @@
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"

chrome/browser/ui/views/location_bar/star_view.cc

@@ -17,7 +17,7 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/omnibox/browser/vector_icons.h"

chrome/browser/ui/views/passwords/password_save_update_with_account_store_view.cc

@@ -21,8 +21,8 @@
 #include "chrome/browser/ui/views/accessibility/non_accessible_image_view.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/chrome_typography.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
 #include "chrome/browser/ui/views/passwords/credentials_item_view.h"
 #include "chrome/browser/ui/views/passwords/password_items_view.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/ui/views/tabs/tab_groups_iph_controller.cc

@@ -12,9 +12,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_params.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_bubble_view.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_params.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_bubble_view.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/feature_engagement/public/event_constants.h"
 #include "components/feature_engagement/public/feature_constants.h"

chrome/browser/ui/views/tabs/tab_groups_iph_controller.h

@@ -10,7 +10,7 @@
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 

chrome/browser/ui/views/tabs/tab_groups_iph_controller_unittest.cc

@@ -10,7 +10,7 @@
 #include "base/bind.h"
 #include "chrome/browser/feature_engagement/tracker_factory.h"
 #include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_controller.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_controller.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/views/chrome_test_widget.h"

chrome/browser/ui/views/toolbar/browser_app_menu_button.cc

@@ -20,7 +20,7 @@
 #include "chrome/browser/ui/ui_features.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_colors.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_colors.h"
 #include "chrome/browser/ui/views/toolbar/app_menu.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"

chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc

@@ -18,7 +18,7 @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/chrome_typography.h"
 #include "chrome/browser/ui/views/chrome_view_class_properties.h"
-#include "chrome/browser/ui/views/feature_promos/feature_promo_colors.h"
+#include "chrome/browser/ui/views/in_product_help/feature_promo_colors.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/vector_icons/vector_icons.h"

chrome/test/BUILD.gn

@@ -2006,9 +2006,6 @@ if (!is_android) {
         "../browser/ui/views/extensions/media_galleries_dialog_views_browsertest.cc",
         "../browser/ui/views/extensions/settings_overridden_dialog_view_browsertest.cc",
         "../browser/ui/views/external_protocol_dialog_browsertest.cc",
-        "../browser/ui/views/feature_promos/feature_promo_dialog_browsertest.cc",
-        "../browser/ui/views/feature_promos/global_media_controls_promo_controller_dialog_browsertest.cc",
-        "../browser/ui/views/feature_promos/reopen_tab_promo_controller_dialog_browsertest.cc",
         "../browser/ui/views/folder_upload_confirmation_view_browsertest.cc",
         "../browser/ui/views/frame/browser_frame_browsertest.cc",
         "../browser/ui/views/frame/browser_non_client_frame_view_browsertest.cc",
@@ -2018,6 +2015,9 @@ if (!is_android) {
         "../browser/ui/views/frame/system_web_app_non_client_frame_view_browsertest.cc",
         "../browser/ui/views/hung_renderer_view_browsertest.cc",
         "../browser/ui/views/importer/import_lock_dialog_view_browsertest.cc",
+        "../browser/ui/views/in_product_help/feature_promo_dialog_browsertest.cc",
+        "../browser/ui/views/in_product_help/global_media_controls_promo_controller_dialog_browsertest.cc",
+        "../browser/ui/views/in_product_help/reopen_tab_promo_controller_dialog_browsertest.cc",
         "../browser/ui/views/location_bar/content_setting_bubble_dialog_browsertest.cc",
         "../browser/ui/views/location_bar/custom_tab_bar_view_browsertest.cc",
         "../browser/ui/views/location_bar/location_bar_view_browsertest.cc",
@@ -5531,7 +5531,6 @@ test("unit_tests") {
       "../browser/ui/views/extensions/extensions_menu_view_unittest.cc",
       "../browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc",
       "../browser/ui/views/extensions/settings_overridden_dialog_view_unittest.cc",
-      "../browser/ui/views/feature_promos/feature_promo_controller_unittest.cc",
       "../browser/ui/views/frame/browser_non_client_frame_view_unittest.cc",
       "../browser/ui/views/frame/browser_view_layout_unittest.cc",
       "../browser/ui/views/frame/browser_view_unittest.cc",
@@ -5544,6 +5543,7 @@ test("unit_tests") {
       "../browser/ui/views/global_media_controls/media_notification_list_view_unittest.cc",
       "../browser/ui/views/global_media_controls/overlay_media_notification_view_unittest.cc",
       "../browser/ui/views/hover_button_unittest.cc",
+      "../browser/ui/views/in_product_help/feature_promo_controller_unittest.cc",
       "../browser/ui/views/infobars/infobar_view_unittest.cc",
       "../browser/ui/views/intent_picker_bubble_view_unittest.cc",
       "../browser/ui/views/layout/interpolating_layout_manager_unittest.cc",