From 756ef54543f64b1295ac6c93df4c7fb9e62ab435 Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Fri, 9 Jul 2010 18:13:25 +0000 Subject: GTK: Fix browser_tests ViewIDTest.Basic not to expect the page menu. TBR=evan,estade BUG=51974 TEST=went green locally. Review URL: http://codereview.chromium.org/2900004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51983 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/view_id_util_browsertest.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'chrome') diff --git a/chrome/browser/gtk/view_id_util_browsertest.cc b/chrome/browser/gtk/view_id_util_browsertest.cc index b647900..783e439 100644 --- a/chrome/browser/gtk/view_id_util_browsertest.cc +++ b/chrome/browser/gtk/view_id_util_browsertest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/gtk/view_id_util.h" +#include "chrome/browser/wrench_menu_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" @@ -37,6 +38,10 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { if (i == VIEW_ID_DEV_EXTENSION_SHELF) continue; + // The page menu is being removed as part of M6 TopChrome reworking. + if (i == VIEW_ID_PAGE_MENU && WrenchMenuModel::IsEnabled()) + continue; + // The following ids are used only in views implementation. if (i == VIEW_ID_CONTENTS_SPLIT || i == VIEW_ID_INFO_BAR_CONTAINER || -- cgit v1.1