summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/search/instant_controller_unittest.cc
diff options
context:
space:
mode:
authorjered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 20:32:11 +0000
committerjered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-03 20:32:11 +0000
commitb8e7ea8bb6ae18b8760e38ceb6bc568b9feed159 (patch)
tree93192f98e9277a4c8691ec39d6971046bf512df4 /chrome/browser/ui/search/instant_controller_unittest.cc
parent6f5c26503e6faa9bd80b21461b1b91eb6abcb983 (diff)
downloadchromium_src-b8e7ea8bb6ae18b8760e38ceb6bc568b9feed159.zip
chromium_src-b8e7ea8bb6ae18b8760e38ceb6bc568b9feed159.tar.gz
chromium_src-b8e7ea8bb6ae18b8760e38ceb6bc568b9feed159.tar.bz2
InstantExtended: Remove overlay control code.
This change deletes the browser-side InstantController code pertaining to old Instant, the HTML popup and search results overlay. A lot of UI and renderer code is still lingering and doing nothing, but I'll get that in another CL. TEST=Manually. Verify that InstantExtended NTP and searching works, and that normal Chrome is unaffected. BUG=251262 TBR=brettw@chromium.org Review URL: https://chromiumcodereview.appspot.com/18223002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210036 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/search/instant_controller_unittest.cc')
-rw-r--r--chrome/browser/ui/search/instant_controller_unittest.cc88
1 files changed, 0 insertions, 88 deletions
diff --git a/chrome/browser/ui/search/instant_controller_unittest.cc b/chrome/browser/ui/search/instant_controller_unittest.cc
index c3c09ac..b96540b 100644
--- a/chrome/browser/ui/search/instant_controller_unittest.cc
+++ b/chrome/browser/ui/search/instant_controller_unittest.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/search/search.h"
#include "chrome/browser/ui/search/instant_controller.h"
#include "chrome/browser/ui/search/instant_ntp.h"
-#include "chrome/browser/ui/search/instant_overlay.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
@@ -22,36 +21,6 @@ using base::HistogramBase;
using base::HistogramSamples;
using base::StatisticsRecorder;
-class TestableInstantOverlay : public InstantOverlay {
- public:
- TestableInstantOverlay(InstantController* controller,
- const std::string& instant_url)
- : InstantOverlay(controller, instant_url, false) {
- }
-
- // Overrides from InstantPage
- virtual bool supports_instant() const OVERRIDE {
- return test_supports_instant_;
- }
-
- virtual bool IsLocal() const OVERRIDE {
- return test_is_local_;
- };
-
- void set_supports_instant(bool supports_instant) {
- test_supports_instant_ = supports_instant;
- }
-
- void set_is_local(bool is_local) {
- test_is_local_ = is_local;
- }
-
- private:
- std::string test_instant_url_;
- bool test_supports_instant_;
- bool test_is_local_;
-};
-
class TestableInstantNTP : public InstantNTP {
public:
TestableInstantNTP(InstantController* controller,
@@ -99,7 +68,6 @@ class TestableInstantController : public InstantController {
override_javascript_enabled_(true),
test_javascript_enabled_(true),
test_in_startup_(false),
- test_overlay_(NULL),
test_ntp_(NULL) {}
// Overrides from InstantController
@@ -115,10 +83,6 @@ class TestableInstantController : public InstantController {
return test_extended_enabled_;
}
- virtual InstantOverlay* overlay() const OVERRIDE {
- return test_overlay_;
- }
-
virtual InstantNTP* ntp() const OVERRIDE {
return test_ntp_;
}
@@ -131,10 +95,6 @@ class TestableInstantController : public InstantController {
test_extended_enabled_ = extended_enabled;
}
- void set_overlay(InstantOverlay* overlay) {
- test_overlay_ = overlay;
- }
-
void set_ntp(InstantNTP* ntp) {
test_ntp_ = ntp;
}
@@ -173,7 +133,6 @@ private:
bool override_javascript_enabled_;
bool test_javascript_enabled_;
bool test_in_startup_;
- InstantOverlay* test_overlay_;
InstantNTP* test_ntp_;
mutable TestingProfile profile_;
};
@@ -198,53 +157,6 @@ class InstantControllerTest : public testing::Test {
scoped_ptr<TestableInstantController> instant_controller_;
};
-TEST_F(InstantControllerTest, ShouldSwitchToLocalOverlay) {
- InstantController::InstantFallbackReason fallback_reason;
-
- instant_controller()->set_extended_enabled(false);
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason, InstantController::INSTANT_FALLBACK_NONE);
-
- instant_controller()->set_extended_enabled(true);
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason, InstantController::INSTANT_FALLBACK_NO_OVERLAY);
-
- std::string instant_url("http://test_url");
- scoped_ptr<TestableInstantOverlay> test_overlay(
- new TestableInstantOverlay(instant_controller(), instant_url));
- test_overlay->set_is_local(true);
- instant_controller()->set_overlay(test_overlay.get());
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason, InstantController::INSTANT_FALLBACK_NONE);
-
- instant_controller()->set_javascript_enabled(false);
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason,
- InstantController::INSTANT_FALLBACK_JAVASCRIPT_DISABLED);
- instant_controller()->set_javascript_enabled(true);
-
- test_overlay->set_is_local(false);
- instant_controller()->set_instant_url("");
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason,
- InstantController::INSTANT_FALLBACK_INSTANT_URL_EMPTY);
-
- instant_controller()->set_instant_url("http://instant_url");
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason,
- InstantController::INSTANT_FALLBACK_ORIGIN_PATH_MISMATCH);
-
- instant_controller()->set_instant_url(instant_url);
- test_overlay->set_supports_instant(false);
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason,
- InstantController::INSTANT_FALLBACK_INSTANT_NOT_SUPPORTED);
-
- test_overlay->set_supports_instant(true);
- fallback_reason = instant_controller()->ShouldSwitchToLocalOverlay();
- ASSERT_EQ(fallback_reason, InstantController::INSTANT_FALLBACK_NONE);
-}
-
TEST_F(InstantControllerTest, PrefersRemoteNTPOnStartup) {
std::string instant_url("http://instant_url");
scoped_ptr<TestableInstantNTP> ntp(new TestableInstantNTP(
generated by cgit v1.1 at 2025-03-28 22:11:07 +0000