Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(754)

Unified Diff: chrome/browser/ui/search/instant_test_utils.cc

Issue 2669973003: Cleanup: Remove unused stuff from InstantTestUtils (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/instant_test_utils.cc
diff --git a/chrome/browser/ui/search/instant_test_utils.cc b/chrome/browser/ui/search/instant_test_utils.cc
index 3dfe0ee4ab70fa6c49ffcd57d7a01be29c58039b..7f04880c48a8d659070323d3dc7358014b24dec1 100644
--- a/chrome/browser/ui/search/instant_test_utils.cc
+++ b/chrome/browser/ui/search/instant_test_utils.cc
@@ -6,7 +6,6 @@
#include <stddef.h>
-#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -14,17 +13,13 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/ui/search/search_tab_helper.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/search_test_utils.h"
#include "components/omnibox/browser/omnibox_edit_model.h"
-#include "components/prefs/pref_service.h"
+#include "components/omnibox/browser/omnibox_view.h"
#include "components/search_engines/template_url_service.h"
-#include "components/variations/entropy_provider.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 {
@@ -68,20 +63,6 @@ void InstantTestBase::SetupInstant(Browser* browser) {
service->SetUserSelectedDefaultSearchProvider(template_url);
}
-void InstantTestBase::SetInstantURL(const std::string& url) {
- TemplateURLService* service =
- TemplateURLServiceFactory::GetForProfile(browser_->profile());
- search_test_utils::WaitForTemplateURLServiceToLoad(service);
-
- TemplateURLData data;
- data.SetShortName(base::ASCIIToUTF16("name"));
- data.SetURL(url);
- data.instant_url = url;
-
- TemplateURL* template_url = service->Add(base::MakeUnique<TemplateURL>(data));
- service->SetUserSelectedDefaultSearchProvider(template_url);
-}
-
void InstantTestBase::Init(const GURL& instant_url,
const GURL& ntp_url,
bool init_suggestions_url) {
@@ -144,15 +125,6 @@ bool InstantTestBase::GetStringFromJS(content::WebContents* contents,
contents, WrapScript(script), result);
}
-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.hidden", &actual) &&
- actual == expected;
-}
-
std::string InstantTestBase::GetOmniboxText() {
return base::UTF16ToUTF8(omnibox()->GetText());
}
@@ -167,11 +139,3 @@ bool InstantTestBase::LoadImage(content::RenderViewHost* rvh,
"img.src = '" + image + "';";
return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);
}
-
-base::string16 InstantTestBase::GetBlueText() {
- size_t start = 0, end = 0;
- omnibox()->GetSelectionBounds(&start, &end);
- if (start > end)
- std::swap(start, end);
- return omnibox()->GetText().substr(start, end - start);
-}
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698