| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/metrics/histogram.h" | 6 #include "base/metrics/histogram.h" |
| 7 #include "base/metrics/histogram_samples.h" | 7 #include "base/metrics/histogram_samples.h" |
| 8 #include "base/metrics/statistics_recorder.h" | 8 #include "base/metrics/statistics_recorder.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/content_settings/host_content_settings_map.h" | 10 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 11 #include "chrome/browser/search/search.h" | 11 #include "chrome/browser/search/search.h" |
| 12 #include "chrome/browser/ui/search/instant_controller.h" | 12 #include "chrome/browser/ui/search/instant_controller.h" |
| 13 #include "chrome/browser/ui/search/instant_ntp.h" | 13 #include "chrome/browser/ui/search/instant_ntp.h" |
| 14 #include "chrome/browser/ui/search/instant_overlay.h" | 14 #include "chrome/browser/ui/search/instant_overlay.h" |
| 15 #include "chrome/common/content_settings.h" | 15 #include "chrome/common/content_settings.h" |
| 16 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 17 #include "chrome/test/base/testing_profile.h" | 17 #include "chrome/test/base/testing_profile.h" |
| 18 #include "content/public/test/test_browser_thread.h" | 18 #include "content/public/test/test_browser_thread.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 20 | 20 |
| 21 using base::HistogramBase; | 21 using base::HistogramBase; |
| 22 using base::HistogramSamples; | 22 using base::HistogramSamples; |
| 23 using base::StatisticsRecorder; | 23 using base::StatisticsRecorder; |
| 24 | 24 |
| 25 class TestableInstantOverlay : public InstantOverlay { | 25 class TestableInstantOverlay : public InstantOverlay { |
| 26 public: | 26 public: |
| 27 TestableInstantOverlay(InstantController* controller, | 27 TestableInstantOverlay(InstantController* controller, |
| 28 const std::string& instant_url) | 28 const std::string& instant_url) |
| 29 : InstantOverlay(controller, instant_url) { | 29 : InstantOverlay(controller, instant_url, false) { |
| 30 } | 30 } |
| 31 | 31 |
| 32 // Overrides from InstantPage | 32 // Overrides from InstantPage |
| 33 virtual bool supports_instant() const OVERRIDE { | 33 virtual bool supports_instant() const OVERRIDE { |
| 34 return test_supports_instant_; | 34 return test_supports_instant_; |
| 35 } | 35 } |
| 36 | 36 |
| 37 virtual bool IsLocal() const OVERRIDE { | 37 virtual bool IsLocal() const OVERRIDE { |
| 38 return test_is_local_; | 38 return test_is_local_; |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 void set_supports_instant(bool supports_instant) { | 41 void set_supports_instant(bool supports_instant) { |
| 42 test_supports_instant_ = supports_instant; | 42 test_supports_instant_ = supports_instant; |
| 43 } | 43 } |
| 44 | 44 |
| 45 void set_is_local(bool is_local) { | 45 void set_is_local(bool is_local) { |
| 46 test_is_local_ = is_local; | 46 test_is_local_ = is_local; |
| 47 } | 47 } |
| 48 | 48 |
| 49 private: | 49 private: |
| 50 std::string test_instant_url_; | 50 std::string test_instant_url_; |
| 51 bool test_supports_instant_; | 51 bool test_supports_instant_; |
| 52 bool test_is_local_; | 52 bool test_is_local_; |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 class TestableInstantNTP : public InstantNTP { | 55 class TestableInstantNTP : public InstantNTP { |
| 56 public: | 56 public: |
| 57 TestableInstantNTP(InstantController* controller, | 57 TestableInstantNTP(InstantController* controller, |
| 58 const std::string& instant_url) | 58 const std::string& instant_url) |
| 59 : InstantNTP(controller, instant_url) { | 59 : InstantNTP(controller, instant_url, false) { |
| 60 } | 60 } |
| 61 | 61 |
| 62 // Overrides from InstantPage | 62 // Overrides from InstantPage |
| 63 virtual bool supports_instant() const OVERRIDE { | 63 virtual bool supports_instant() const OVERRIDE { |
| 64 return test_supports_instant_; | 64 return test_supports_instant_; |
| 65 } | 65 } |
| 66 | 66 |
| 67 virtual bool IsLocal() const OVERRIDE { | 67 virtual bool IsLocal() const OVERRIDE { |
| 68 return test_is_local_; | 68 return test_is_local_; |
| 69 }; | 69 }; |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 | 368 |
| 369 TEST_F(InstantControllerTest, IsJavascriptEnabledChecksPrefs) { | 369 TEST_F(InstantControllerTest, IsJavascriptEnabledChecksPrefs) { |
| 370 instant_controller()->set_override_javascript_enabled(false); | 370 instant_controller()->set_override_javascript_enabled(false); |
| 371 instant_controller()->profile()->GetPrefs()->SetBoolean( | 371 instant_controller()->profile()->GetPrefs()->SetBoolean( |
| 372 prefs::kWebKitJavascriptEnabled, true); | 372 prefs::kWebKitJavascriptEnabled, true); |
| 373 EXPECT_TRUE(instant_controller()->IsJavascriptEnabled()); | 373 EXPECT_TRUE(instant_controller()->IsJavascriptEnabled()); |
| 374 instant_controller()->profile()->GetPrefs()->SetBoolean( | 374 instant_controller()->profile()->GetPrefs()->SetBoolean( |
| 375 prefs::kWebKitJavascriptEnabled, false); | 375 prefs::kWebKitJavascriptEnabled, false); |
| 376 EXPECT_FALSE(instant_controller()->IsJavascriptEnabled()); | 376 EXPECT_FALSE(instant_controller()->IsJavascriptEnabled()); |
| 377 } | 377 } |
| OLD | NEW |