| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/search/search_model.h" | 5 #include "chrome/browser/ui/search/search_model.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/ui/search/search_model_observer.h" | 8 #include "chrome/browser/ui/search/search_model_observer.h" |
| 9 #include "chrome/browser/ui/search/search_tab_helper.h" | 9 #include "chrome/browser/ui/search/search_tab_helper.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 class SearchModelTest : public ChromeRenderViewHostTestHarness { | 67 class SearchModelTest : public ChromeRenderViewHostTestHarness { |
| 68 public: | 68 public: |
| 69 virtual void SetUp() OVERRIDE; | 69 virtual void SetUp() OVERRIDE; |
| 70 virtual void TearDown() OVERRIDE; | 70 virtual void TearDown() OVERRIDE; |
| 71 | 71 |
| 72 MockSearchModelObserver mock_observer; | 72 MockSearchModelObserver mock_observer; |
| 73 SearchModel* model; | 73 SearchModel* model; |
| 74 }; | 74 }; |
| 75 | 75 |
| 76 void SearchModelTest::SetUp() { | 76 void SearchModelTest::SetUp() { |
| 77 CommandLine::ForCurrentProcess()->AppendSwitch( | |
| 78 switches::kEnableInstantExtendedAPI); | |
| 79 ChromeRenderViewHostTestHarness::SetUp(); | 77 ChromeRenderViewHostTestHarness::SetUp(); |
| 80 SearchTabHelper::CreateForWebContents(web_contents()); | 78 SearchTabHelper::CreateForWebContents(web_contents()); |
| 81 SearchTabHelper* search_tab_helper = | 79 SearchTabHelper* search_tab_helper = |
| 82 SearchTabHelper::FromWebContents(web_contents()); | 80 SearchTabHelper::FromWebContents(web_contents()); |
| 83 ASSERT_TRUE(search_tab_helper != NULL); | 81 ASSERT_TRUE(search_tab_helper != NULL); |
| 84 model = search_tab_helper->model(); | 82 model = search_tab_helper->model(); |
| 85 model->AddObserver(&mock_observer); | 83 model->AddObserver(&mock_observer); |
| 86 } | 84 } |
| 87 | 85 |
| 88 void SearchModelTest::TearDown() { | 86 void SearchModelTest::TearDown() { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 148 |
| 151 SearchModel::State expected_old_state = model->state(); | 149 SearchModel::State expected_old_state = model->state(); |
| 152 SearchModel::State expected_new_state(model->state()); | 150 SearchModel::State expected_new_state(model->state()); |
| 153 expected_new_state.voice_search_supported = true; | 151 expected_new_state.voice_search_supported = true; |
| 154 | 152 |
| 155 model->SetVoiceSearchSupported(true); | 153 model->SetVoiceSearchSupported(true); |
| 156 mock_observer.VerifySearchModelStates(expected_old_state, expected_new_state); | 154 mock_observer.VerifySearchModelStates(expected_old_state, expected_new_state); |
| 157 mock_observer.VerifyNotificationCount(1); | 155 mock_observer.VerifyNotificationCount(1); |
| 158 EXPECT_TRUE(model->voice_search_supported()); | 156 EXPECT_TRUE(model->voice_search_supported()); |
| 159 } | 157 } |
| OLD | NEW |