| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "web/FrameLoaderClientImpl.h" | 33 #include "web/FrameLoaderClientImpl.h" |
| 34 | 34 |
| 35 #include "core/loader/FrameLoader.h" | 35 #include "core/loader/FrameLoader.h" |
| 36 #include "platform/weborigin/KURL.h" | 36 #include "platform/weborigin/KURL.h" |
| 37 #include "public/web/WebFrameClient.h" | 37 #include "public/web/WebFrameClient.h" |
| 38 #include "public/web/WebSettings.h" | |
| 39 #include "public/web/WebView.h" | 38 #include "public/web/WebView.h" |
| 40 #include "web/WebLocalFrameImpl.h" | 39 #include "web/WebLocalFrameImpl.h" |
| 41 #include "wtf/text/CString.h" | 40 #include "wtf/text/CString.h" |
| 42 #include "wtf/text/WTFString.h" | 41 #include "wtf/text/WTFString.h" |
| 43 | 42 |
| 44 #include <gtest/gtest.h> | 43 #include <gtest/gtest.h> |
| 45 | 44 |
| 46 using namespace blink; | 45 using namespace blink; |
| 47 | 46 |
| 48 namespace { | 47 namespace { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 64 | 63 |
| 65 private: | 64 private: |
| 66 WebString m_userAgentOverride; | 65 WebString m_userAgentOverride; |
| 67 }; | 66 }; |
| 68 | 67 |
| 69 class FrameLoaderClientImplTest : public testing::Test { | 68 class FrameLoaderClientImplTest : public testing::Test { |
| 70 public: | 69 public: |
| 71 void SetUp() | 70 void SetUp() |
| 72 { | 71 { |
| 73 m_webView = WebView::create(0); | 72 m_webView = WebView::create(0); |
| 74 // FIXME: http://crbug.com/363843. This needs to find a better way to | |
| 75 // not create graphics layers. | |
| 76 m_webView->settings()->setAcceleratedCompositingEnabled(false); | |
| 77 m_mainFrame = WebLocalFrame::create(&m_webFrameClient); | 73 m_mainFrame = WebLocalFrame::create(&m_webFrameClient); |
| 78 m_webView->setMainFrame(m_mainFrame); | 74 m_webView->setMainFrame(m_mainFrame); |
| 79 m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_
webView->mainFrame())->frame()->loader().client()); | 75 m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_
webView->mainFrame())->frame()->loader().client()); |
| 80 } | 76 } |
| 81 | 77 |
| 82 void TearDown() | 78 void TearDown() |
| 83 { | 79 { |
| 84 m_webView->close(); | 80 m_webView->close(); |
| 85 m_mainFrame->close(); | 81 m_mainFrame->close(); |
| 86 } | 82 } |
| (...skipping 26 matching lines...) Expand all Loading... |
| 113 // Override the user agent and make sure we get it back. | 109 // Override the user agent and make sure we get it back. |
| 114 setUserAgentOverride(override); | 110 setUserAgentOverride(override); |
| 115 EXPECT_TRUE(override.equals(userAgent())); | 111 EXPECT_TRUE(override.equals(userAgent())); |
| 116 | 112 |
| 117 // Remove the override and make sure we get the original back. | 113 // Remove the override and make sure we get the original back. |
| 118 setUserAgentOverride(WebString()); | 114 setUserAgentOverride(WebString()); |
| 119 EXPECT_TRUE(defaultUserAgent.equals(userAgent())); | 115 EXPECT_TRUE(defaultUserAgent.equals(userAgent())); |
| 120 } | 116 } |
| 121 | 117 |
| 122 } // namespace | 118 } // namespace |
| OLD | NEW |