Move //chrome/android/.../appmenu/ to //chrome/android/.../app/appmenu/

BUG=966644

Change-Id: I75bda71622317d90156a81c526ee4b6267d8a785
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159755
Commit-Queue: Theresa  <twellington@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Auto-Submit: Theresa  <twellington@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761156}

chrome/android/chrome_java_sources.gni

@@ -72,10 +72,10 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/AccessibilityTabModelWrapper.java",
   "java/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayout.java",
   "java/src/org/chromium/chrome/browser/announcement/AnnouncementNotificationManager.java",
+  "java/src/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java",
+  "java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java",
+  "java/src/org/chromium/chrome/browser/app/appmenu/UpdateMenuItemViewBinder.java",
   "java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuIconRowFooter.java",
-  "java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java",
-  "java/src/org/chromium/chrome/browser/appmenu/UpdateMenuItemViewBinder.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowBridge.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillExpirationDateFixFlowPrompt.java",
   "java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java",

chrome/android/chrome_junit_test_java_sources.gni

@@ -11,7 +11,7 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/ShadowIdleHandlerAwareMessageQueue.java",
   "junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java",
   "junit/src/org/chromium/chrome/browser/about_settings/AboutSettingsBridgeTest.java",
-  "junit/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateUnitTest.java",
+  "junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/autofill/AutofillUiUtilsTest.java",
   "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskSchedulerTest.java",
   "junit/src/org/chromium/chrome/browser/background_sync/BackgroundSyncBackgroundTaskTest.java",

chrome/android/chrome_test_java_sources.gni

@@ -50,9 +50,9 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/accessibility/FontSizePrefsTest.java",
   "javatests/src/org/chromium/chrome/browser/accessibility/settings/AccessibilitySettingsTest.java",
   "javatests/src/org/chromium/chrome/browser/accessibility_tab_switcher/OverviewListLayoutTest.java",
-  "javatests/src/org/chromium/chrome/browser/appmenu/DataSaverAppMenuTest.java",
-  "javatests/src/org/chromium/chrome/browser/appmenu/OverviewAppMenuTest.java",
-  "javatests/src/org/chromium/chrome/browser/appmenu/TabbedAppMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/app/appmenu/DataSaverAppMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/app/appmenu/OverviewAppMenuTest.java",
+  "javatests/src/org/chromium/chrome/browser/app/appmenu/TabbedAppMenuTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupWithKeyboardTest.java",
   "javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java",

chrome/android/java/res/layout/icon_row_menu_footer.xml

@@ -4,7 +4,7 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file.
 -->
-<org.chromium.chrome.browser.appmenu.AppMenuIconRowFooter
+<org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -50,4 +50,4 @@
             android:contentDescription="@string/accessibility_btn_refresh"
             tools:src="@drawable/btn_reload_stop" />
     </LinearLayout>
-</org.chromium.chrome.browser.appmenu.AppMenuIconRowFooter>
+</org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter>

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -53,8 +53,8 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
 import org.chromium.chrome.browser.IntentHandler.TabOpenType;
+import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
 import org.chromium.chrome.browser.app.flags.ChromeCachedFlags;
-import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegateImpl;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.bookmarks.BookmarkModel;
 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuIconRowFooter.java → chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuIconRowFooter.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateImpl.java → chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;

chrome/android/java/src/org/chromium/chrome/browser/appmenu/UpdateMenuItemViewBinder.java → chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/UpdateMenuItemViewBinder.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java

@@ -22,7 +22,7 @@ import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.DefaultBrowserInfo;
-import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegateImpl;
+import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.browserservices.BrowserServicesIntentDataProvider.CustomTabsUiType;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;

chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedAppMenuPropertiesDelegate.java

@@ -10,8 +10,8 @@ import android.view.View;
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
-import org.chromium.chrome.browser.appmenu.AppMenuIconRowFooter;
-import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegateImpl;
+import org.chromium.chrome.browser.app.appmenu.AppMenuIconRowFooter;
+import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.datareduction.DataReductionMainMenuItem;

chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/DataSaverAppMenuTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/app/appmenu/DataSaverAppMenuTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import android.support.test.filters.SmallTest;
 

chrome/android/javatests/src/org/chromium/chrome/browser/app/appmenu/OWNERS

+file://chrome/browser/ui/android/appmenu/OWNERS

chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/OverviewAppMenuTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/app/appmenu/OverviewAppMenuTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;

chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/TabbedAppMenuTest.java → chrome/android/javatests/src/org/chromium/chrome/browser/app/appmenu/TabbedAppMenuTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import android.content.pm.ActivityInfo;
 import android.support.test.InstrumentationRegistry;

chrome/android/junit/DEPS

@@ -4,6 +4,7 @@ include_rules = [
   "+chrome/browser/image_fetcher",
   "+chrome/android/java/src/org/chromium/chrome/browser/ssl/ChromeSecurityStateModelDelegate.java",
   "+chrome/browser/profiles/android",
+  "+chrome/browser/tab",
   "+chrome/browser/thumbnail/generator/android/java",
   "+chrome/browser/ui/messages/android/java",
   "+components/autofill/android/java/src/org/chromium/components/autofill",

chrome/android/junit/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegateUnitTest.java → chrome/android/junit/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateUnitTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.appmenu;
+package org.chromium.chrome.browser.app.appmenu;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -28,7 +28,7 @@ import org.chromium.base.supplier.ObservableSupplierImpl;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
-import org.chromium.chrome.browser.appmenu.AppMenuPropertiesDelegateImpl.MenuGroup;
+import org.chromium.chrome.browser.app.appmenu.AppMenuPropertiesDelegateImpl.MenuGroup;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
 import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;