| 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 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 "web/LocalFrameClientImpl.h" | 31 #include "web/LocalFrameClientImpl.h" |
| 32 | 32 |
| 33 #include "core/loader/FrameLoader.h" | 33 #include "core/loader/FrameLoader.h" |
| 34 #include "platform/weborigin/KURL.h" | 34 #include "platform/weborigin/KURL.h" |
| 35 #include "platform/wtf/text/CString.h" |
| 36 #include "platform/wtf/text/WTFString.h" |
| 35 #include "public/web/WebFrameClient.h" | 37 #include "public/web/WebFrameClient.h" |
| 36 #include "public/web/WebSettings.h" | 38 #include "public/web/WebSettings.h" |
| 37 #include "public/web/WebView.h" | 39 #include "public/web/WebView.h" |
| 38 #include "testing/gmock/include/gmock/gmock.h" | 40 #include "testing/gmock/include/gmock/gmock.h" |
| 39 #include "testing/gtest/include/gtest/gtest.h" | 41 #include "testing/gtest/include/gtest/gtest.h" |
| 40 #include "web/WebLocalFrameImpl.h" | 42 #include "web/WebLocalFrameImpl.h" |
| 41 #include "web/tests/FrameTestHelpers.h" | 43 #include "web/tests/FrameTestHelpers.h" |
| 42 #include "wtf/text/CString.h" | |
| 43 #include "wtf/text/WTFString.h" | |
| 44 | 44 |
| 45 using testing::_; | 45 using testing::_; |
| 46 using testing::Mock; | 46 using testing::Mock; |
| 47 using testing::Return; | 47 using testing::Return; |
| 48 | 48 |
| 49 namespace blink { | 49 namespace blink { |
| 50 namespace { | 50 namespace { |
| 51 | 51 |
| 52 class MockWebFrameClient : public FrameTestHelpers::TestWebFrameClient { | 52 class MockWebFrameClient : public FrameTestHelpers::TestWebFrameClient { |
| 53 public: | 53 public: |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 Mock::VerifyAndClearExpectations(&webFrameClient()); | 111 Mock::VerifyAndClearExpectations(&webFrameClient()); |
| 112 | 112 |
| 113 // Remove the override and make sure we get the original back. | 113 // Remove the override and make sure we get the original back. |
| 114 EXPECT_CALL(webFrameClient(), userAgentOverride()) | 114 EXPECT_CALL(webFrameClient(), userAgentOverride()) |
| 115 .WillOnce(Return(WebString())); | 115 .WillOnce(Return(WebString())); |
| 116 EXPECT_TRUE(defaultUserAgent.equals(userAgent())); | 116 EXPECT_TRUE(defaultUserAgent.equals(userAgent())); |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace | 119 } // namespace |
| 120 } // namespace blink | 120 } // namespace blink |
| OLD | NEW |