diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 20:06:23 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 20:06:23 +0000 |
| commit | d425feaf99d5de254e4b33d0abfeec2b0727bbf7 (patch) | |
| tree | 4bd4197a183b5cc92f2972a88b509eda4729d6a0 | |
| parent | db95ba30cc8ecbe40c7801b0b529cc22692c797b (diff) | |
| download | chromium_src-d425feaf99d5de254e4b33d0abfeec2b0727bbf7.zip chromium_src-d425feaf99d5de254e4b33d0abfeec2b0727bbf7.tar.gz chromium_src-d425feaf99d5de254e4b33d0abfeec2b0727bbf7.tar.bz2 | |
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
| -rw-r--r-- | chrome/browser/ui/search/search_delegate_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
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()); |