[Extensions] Move views-related extension_action_test_helper files

Move views-related extension_action_test_helper* files from
chrome/browser/ui/views/toolbar to chrome/browser/ui/views/extensions.
They make more sense there.

Bug: None
Change-Id: I5f8a6c95bdda72a910f9645dc5f3946f0e148bb8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2153703
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759867}

chrome/browser/ui/BUILD.gn

@@ -4376,19 +4376,19 @@ static_library("test_support") {
     ]
     sources += [
       "extensions/extension_action_test_helper.h",
+      "views/extensions/extension_action_test_helper_mac.mm",
+      "views/extensions/extension_action_test_helper_views.cc",
+      "views/extensions/extension_action_test_helper_views.h",
       "views/extensions/extensions_menu_test_util.cc",
       "views/extensions/extensions_menu_test_util.h",
       "views/find_bar_host_unittest_util_views.cc",
       "views/payments/test_chrome_payment_request_delegate.cc",
       "views/payments/test_chrome_payment_request_delegate.h",
-      "views/toolbar/extension_action_test_helper_mac.mm",
-      "views/toolbar/extension_action_test_helper_views.cc",
-      "views/toolbar/extension_action_test_helper_views.h",
       "views/webauthn/authenticator_request_dialog_view_test_api.cc",
       "views/webauthn/authenticator_request_dialog_view_test_api.h",
     ]
     if (use_aura) {
-      sources += [ "views/toolbar/extension_action_test_helper_aura.cc" ]
+      sources += [ "views/extensions/extension_action_test_helper_aura.cc" ]
       deps += [
         "//ui/aura",
         "//ui/wm",

chrome/browser/ui/views/toolbar/extension_action_test_helper_views.cc → chrome/browser/ui/views/extensions/extension_action_test_helper_views.cc

@@ -13,11 +13,11 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"
 #include "chrome/browser/ui/ui_features.h"
+#include "chrome/browser/ui/views/extensions/extension_action_test_helper_views.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/extensions/extensions_menu_test_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
-#include "chrome/browser/ui/views/toolbar/extension_action_test_helper_views.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "ui/gfx/geometry/rect.h"

chrome/browser/ui/views/toolbar/extension_action_test_helper_views.h → chrome/browser/ui/views/extensions/extension_action_test_helper_views.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_TOOLBAR_EXTENSION_ACTION_TEST_HELPER_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_ACTION_TEST_HELPER_VIEWS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_ACTION_TEST_HELPER_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_ACTION_TEST_HELPER_VIEWS_H_
 
 #include <memory>
 
@@ -62,4 +62,4 @@ class ExtensionActionTestHelperViews : public ExtensionActionTestHelper {
   BrowserActionsContainer* const browser_actions_container_;
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_EXTENSION_ACTION_TEST_HELPER_VIEWS_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_ACTION_TEST_HELPER_VIEWS_H_