From d425feaf99d5de254e4b33d0abfeec2b0727bbf7 Mon Sep 17 00:00:00 2001 From: "dhollowa@chromium.org" Date: Tue, 21 Aug 2012 20:06:23 +0000 Subject: SearchDelegateTest.SearchModel fails on branded Chrome Avoids this test on branded Chrome where channel is set to CHANNEL_STABLE. Feature is enabled for dev channel or lower. BUG=none TEST=Branded builders go green. TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10827446 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152615 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/search/search_delegate_unittest.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chrome/browser/ui/search/search_delegate_unittest.cc b/chrome/browser/ui/search/search_delegate_unittest.cc index 5a865f9..b153515 100644 --- a/chrome/browser/ui/search/search_delegate_unittest.cc +++ b/chrome/browser/ui/search/search_delegate_unittest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/search/search.h" #include "chrome/browser/ui/search/search_model.h" #include "chrome/browser/ui/search/search_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -22,6 +23,10 @@ TEST_F(SearchDelegateTest, SearchModel) { CommandLine* command_line = CommandLine::ForCurrentProcess(); command_line->AppendSwitch(switches::kEnableInstantExtendedAPI); + // Avoid these tests on branded Chrome where channel is set to CHANNEL_STABLE. + if (!chrome::search::IsInstantExtendedAPIEnabled(profile())) + return; + // Initial state. EXPECT_TRUE(browser()->search_model()->mode().is_default()); -- cgit v1.1