Index: chrome/browser/instant/instant_test_utils.cc |
diff --git a/chrome/browser/instant/instant_test_utils.cc b/chrome/browser/instant/instant_test_utils.cc |
deleted file mode 100644 |
index 2bdfe5944cd46379842a16d2188177caa84c0735..0000000000000000000000000000000000000000 |
--- a/chrome/browser/instant/instant_test_utils.cc |
+++ /dev/null |
@@ -1,197 +0,0 @@ |
-// Copyright 2013 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
- |
-#include "chrome/browser/instant/instant_test_utils.h" |
- |
-#include "base/command_line.h" |
-#include "base/prefs/pref_service.h" |
-#include "chrome/browser/profiles/profile.h" |
-#include "chrome/browser/search_engines/template_url_service.h" |
-#include "chrome/browser/search_engines/template_url_service_factory.h" |
-#include "chrome/browser/ui/omnibox/omnibox_view.h" |
-#include "chrome/common/chrome_notification_types.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/pref_names.h" |
-#include "chrome/test/base/interactive_test_utils.h" |
-#include "chrome/test/base/ui_test_utils.h" |
-#include "content/public/browser/notification_service.h" |
-#include "content/public/browser/render_process_host.h" |
-#include "content/public/browser/web_contents.h" |
-#include "content/public/common/result_codes.h" |
-#include "content/public/test/browser_test_utils.h" |
- |
-namespace { |
- |
-std::string WrapScript(const std::string& script) { |
- return "domAutomationController.send(" + script + ")"; |
-} |
- |
-} // namespace |
- |
-// InstantTestModelObserver -------------------------------------------------- |
- |
-InstantTestModelObserver::InstantTestModelObserver( |
- InstantOverlayModel* model, |
- chrome::search::Mode::Type desired_mode_type) |
- : model_(model), |
- desired_mode_type_(desired_mode_type) { |
- model_->AddObserver(this); |
-} |
- |
-InstantTestModelObserver::~InstantTestModelObserver() { |
- model_->RemoveObserver(this); |
-} |
- |
-void InstantTestModelObserver::WaitForDesiredOverlayState() { |
- run_loop_.Run(); |
-} |
- |
-void InstantTestModelObserver::OverlayStateChanged( |
- const InstantOverlayModel& model) { |
- if (model.mode().mode == desired_mode_type_) |
- run_loop_.Quit(); |
-} |
- |
-// InstantTestBase ----------------------------------------------------------- |
- |
-void InstantTestBase::SetupInstant(Browser* browser) { |
- browser_ = browser; |
- TemplateURLService* service = |
- TemplateURLServiceFactory::GetForProfile(browser_->profile()); |
- ui_test_utils::WaitForTemplateURLServiceToLoad(service); |
- |
- TemplateURLData data; |
- // Necessary to use exact URL for both the main URL and the alternate URL for |
- // search term extraction to work in InstantExtended. |
- data.SetURL(instant_url_.spec() + "q={searchTerms}"); |
- data.instant_url = instant_url_.spec(); |
- data.alternate_urls.push_back(instant_url_.spec() + "#q={searchTerms}"); |
- data.search_terms_replacement_key = "strk"; |
- |
- TemplateURL* template_url = new TemplateURL(browser_->profile(), data); |
- service->Add(template_url); // Takes ownership of |template_url|. |
- service->SetDefaultSearchProvider(template_url); |
- |
- browser_->profile()->GetPrefs()->SetBoolean(prefs::kInstantEnabled, true); |
- |
- // TODO(shishir): Fix this ugly hack. |
- instant()->SetInstantEnabled(false, true); |
- instant()->SetInstantEnabled(true, false); |
-} |
- |
-void InstantTestBase::Init(const GURL& instant_url) { |
- instant_url_ = instant_url; |
-} |
- |
-void InstantTestBase::KillInstantRenderView() { |
- base::KillProcess( |
- instant()->GetOverlayContents()->GetRenderProcessHost()->GetHandle(), |
- content::RESULT_CODE_KILLED, |
- false); |
-} |
- |
-void InstantTestBase::FocusOmnibox() { |
- // If the omnibox already has focus, just notify Instant. |
- if (omnibox()->model()->has_focus()) { |
- instant()->OmniboxFocusChanged(OMNIBOX_FOCUS_VISIBLE, |
- OMNIBOX_FOCUS_CHANGE_EXPLICIT, NULL); |
- } else { |
- browser_->window()->GetLocationBar()->FocusLocation(false); |
- } |
-} |
- |
-void InstantTestBase::FocusOmniboxAndWaitForInstantSupport() { |
- content::WindowedNotificationObserver observer( |
- chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED, |
- content::NotificationService::AllSources()); |
- FocusOmnibox(); |
- observer.Wait(); |
-} |
- |
-void InstantTestBase::FocusOmniboxAndWaitForInstantExtendedSupport() { |
- content::WindowedNotificationObserver ntp_observer( |
- chrome::NOTIFICATION_INSTANT_NTP_SUPPORT_DETERMINED, |
- content::NotificationService::AllSources()); |
- content::WindowedNotificationObserver overlay_observer( |
- chrome::NOTIFICATION_INSTANT_OVERLAY_SUPPORT_DETERMINED, |
- content::NotificationService::AllSources()); |
- FocusOmnibox(); |
- ntp_observer.Wait(); |
- overlay_observer.Wait(); |
-} |
- |
-void InstantTestBase::SetOmniboxText(const std::string& text) { |
- FocusOmnibox(); |
- omnibox()->SetUserText(UTF8ToUTF16(text)); |
-} |
- |
-void InstantTestBase::SetOmniboxTextAndWaitForOverlayToShow( |
- const std::string& text) { |
- InstantTestModelObserver observer( |
- instant()->model(), chrome::search::Mode::MODE_SEARCH_SUGGESTIONS); |
- SetOmniboxText(text); |
- observer.WaitForDesiredOverlayState(); |
-} |
- |
-void InstantTestBase::SetOmniboxTextAndWaitForSuggestion( |
- const std::string& text) { |
- content::WindowedNotificationObserver observer( |
- chrome::NOTIFICATION_INSTANT_SET_SUGGESTION, |
- content::NotificationService::AllSources()); |
- SetOmniboxText(text); |
- observer.Wait(); |
-} |
- |
-bool InstantTestBase::GetBoolFromJS(content::WebContents* contents, |
- const std::string& script, |
- bool* result) { |
- return content::ExecuteScriptAndExtractBool( |
- contents, WrapScript(script), result); |
-} |
- |
-bool InstantTestBase::GetIntFromJS(content::WebContents* contents, |
- const std::string& script, |
- int* result) { |
- return content::ExecuteScriptAndExtractInt( |
- contents, WrapScript(script), result); |
-} |
- |
-bool InstantTestBase::GetStringFromJS(content::WebContents* contents, |
- const std::string& script, |
- std::string* result) { |
- return content::ExecuteScriptAndExtractString( |
- contents, WrapScript(script), result); |
-} |
- |
-bool InstantTestBase::ExecuteScript(const std::string& script) { |
- return content::ExecuteScript(instant()->GetOverlayContents(), script); |
-} |
- |
-bool InstantTestBase::CheckVisibilityIs(content::WebContents* contents, |
- bool expected) { |
- bool actual = !expected; // Purposely start with a mis-match. |
- // We can only use ASSERT_*() in a method that returns void, hence this |
- // convoluted check. |
- return GetBoolFromJS(contents, "!document.webkitHidden", &actual) && |
- actual == expected; |
-} |
- |
-bool InstantTestBase::HasUserInputInProgress() { |
- return omnibox()->model()->user_input_in_progress_; |
-} |
- |
-bool InstantTestBase::HasTemporaryText() { |
- return omnibox()->model()->has_temporary_text_; |
-} |
- |
-bool InstantTestBase::LoadImage(content::RenderViewHost* rvh, |
- const std::string& image, |
- bool* loaded) { |
- std::string js_chrome = |
- "var img = document.createElement('img');" |
- "img.onerror = function() { domAutomationController.send(false); };" |
- "img.onload = function() { domAutomationController.send(true); };" |
- "img.src = '" + image + "';"; |
- return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded); |
-} |