| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "chrome/browser/instant/search.h" |
| 7 #include "chrome/browser/search_engines/template_url_service.h" | 8 #include "chrome/browser/search_engines/template_url_service.h" |
| 8 #include "chrome/browser/search_engines/template_url_service_factory.h" | 9 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 9 #include "chrome/browser/ui/search/search.h" | |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 13 #include "chrome/test/base/browser_with_test_window_test.h" | 13 #include "chrome/test/base/browser_with_test_window_test.h" |
| 14 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 16 | 16 |
| 17 namespace chrome { | 17 namespace chrome { |
| 18 namespace search { | 18 namespace search { |
| 19 | 19 |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 EXPECT_EQ(GURL("http://myserver.com:9000/dev?bar=bar&strk#bar=bar"), | 308 EXPECT_EQ(GURL("http://myserver.com:9000/dev?bar=bar&strk#bar=bar"), |
| 309 GetInstantURL(profile())); | 309 GetInstantURL(profile())); |
| 310 | 310 |
| 311 // Disable suggest. No Instant URL. | 311 // Disable suggest. No Instant URL. |
| 312 profile()->GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, false); | 312 profile()->GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, false); |
| 313 EXPECT_EQ(GURL(), GetInstantURL(profile())); | 313 EXPECT_EQ(GURL(), GetInstantURL(profile())); |
| 314 } | 314 } |
| 315 | 315 |
| 316 } // namespace search | 316 } // namespace search |
| 317 } // namespace chrome | 317 } // namespace chrome |
| OLD | NEW |