Move AppMenuTest from ChromeShellTest to ChromePublicTest

chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java

Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 661d9b7c72c284764cbe07babf190e8e8fef4a4c..6cf0aa942c5aab7d632ce1ef0f2e2416d1759ad1 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -106,14 +106,6 @@ public class ChromeShellActivity extends AppCompatActivity implements AppMenuPro
                 AppMenuPropertiesDelegate delegate, int menuResourceId);
     }
 
-    private static AppMenuHandlerFactory sAppMenuHandlerFactory =
-            new AppMenuHandlerFactory() {
-                @Override
-                public AppMenuHandler getAppMenuHandler(Activity activity,
-                        AppMenuPropertiesDelegate delegate, int menuResourceId) {
-                    return new AppMenuHandler(activity, delegate, menuResourceId);
-                }
-            };
     private AppMenuHandler mAppMenuHandler;
 
     @Override
@@ -189,8 +181,7 @@ public class ChromeShellActivity extends AppCompatActivity implements AppMenuPro
             mTabManager.setStartupUrl(startupUrl);
         }
         mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar);
-        mAppMenuHandler = sAppMenuHandlerFactory.getAppMenuHandler(this, this,
-                R.menu.chrome_shell_main_menu);
+        mAppMenuHandler = new AppMenuHandler(this, this, R.menu.chrome_shell_main_menu);
         mToolbar.setMenuHandler(mAppMenuHandler);
 
         mDevToolsServer = new DevToolsServer("chrome_shell");
@@ -484,11 +475,6 @@ public class ChromeShellActivity extends AppCompatActivity implements AppMenuPro
         return mTabManager.getTabModelSelector();
     }
 
-    @VisibleForTesting
-    public static void setAppMenuHandlerFactory(AppMenuHandlerFactory factory) {
-        sAppMenuHandlerFactory = factory;
-    }
-
     /**
      * Open a dialog that gives the user the option to sign in from a list of available accounts.
      *