| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <vector> |
| 8 |
| 7 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
| 9 #include "chrome/common/extensions/extension_builder.h" | 11 #include "chrome/common/extensions/extension_builder.h" |
| 12 #include "chrome/renderer/searchbox/search_bouncer.h" |
| 10 #include "content/public/common/webplugininfo.h" | 13 #include "content/public/common/webplugininfo.h" |
| 11 #include "extensions/common/manifest_constants.h" | 14 #include "extensions/common/manifest_constants.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 13 #include "third_party/WebKit/public/platform/WebString.h" | 16 #include "third_party/WebKit/public/platform/WebString.h" |
| 14 #include "third_party/WebKit/public/platform/WebVector.h" | 17 #include "third_party/WebKit/public/platform/WebVector.h" |
| 15 #include "third_party/WebKit/public/web/WebPluginParams.h" | 18 #include "third_party/WebKit/public/web/WebPluginParams.h" |
| 16 #include "url/gurl.h" | 19 #include "url/gurl.h" |
| 17 | 20 |
| 18 using WebKit::WebPluginParams; | 21 using WebKit::WebPluginParams; |
| 19 using WebKit::WebString; | 22 using WebKit::WebString; |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 GURL(), | 338 GURL(), |
| 336 GURL("http://example.evil.com/test.html"), | 339 GURL("http://example.evil.com/test.html"), |
| 337 kNaClRestricted, | 340 kNaClRestricted, |
| 338 CreateHostedApp(kExtensionRestricted, | 341 CreateHostedApp(kExtensionRestricted, |
| 339 kExtensionNotFromWebStore, | 342 kExtensionNotFromWebStore, |
| 340 "http://example.com/").get(), | 343 "http://example.com/").get(), |
| 341 ¶ms)); | 344 ¶ms)); |
| 342 } | 345 } |
| 343 } | 346 } |
| 344 | 347 |
| 348 TEST_F(ChromeContentRendererClientTest, ShouldSuppressErrorPage) { |
| 349 ChromeContentRendererClient client; |
| 350 client.search_bouncer_.reset(new SearchBouncer); |
| 351 client.search_bouncer_->OnSetSearchURLs( |
| 352 std::vector<GURL>(), GURL("http://example.com/n")); |
| 353 EXPECT_FALSE(client.ShouldSuppressErrorPage(GURL("http://example.com"))); |
| 354 EXPECT_TRUE(client.ShouldSuppressErrorPage(GURL("http://example.com/n"))); |
| 355 } |
| 356 |
| 345 } // namespace chrome | 357 } // namespace chrome |
| OLD | NEW |