Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(590)

Side by Side Diff: Source/web/tests/FrameLoaderClientImplTest.cpp

Issue 241303002: Rename WebFrameImpl to WebLocalFrameImpl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Mac too Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/CustomEventTest.cpp ('k') | Source/web/tests/FrameTestHelpers.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 15 matching lines...) Expand all
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 "config.h" 31 #include "config.h"
32 32
33 #include "FrameLoaderClientImpl.h" 33 #include "FrameLoaderClientImpl.h"
34 34
35 #include "WebFrameClient.h" 35 #include "WebFrameClient.h"
36 #include "WebFrameImpl.h" 36 #include "WebLocalFrameImpl.h"
37 #include "WebView.h" 37 #include "WebView.h"
38 #include "core/loader/FrameLoader.h" 38 #include "core/loader/FrameLoader.h"
39 #include "platform/weborigin/KURL.h" 39 #include "platform/weborigin/KURL.h"
40 #include "wtf/text/CString.h" 40 #include "wtf/text/CString.h"
41 #include "wtf/text/WTFString.h" 41 #include "wtf/text/WTFString.h"
42 42
43 #include <gtest/gtest.h> 43 #include <gtest/gtest.h>
44 44
45 using namespace blink; 45 using namespace blink;
46 46
(...skipping 18 matching lines...) Expand all
65 WebString m_userAgentOverride; 65 WebString m_userAgentOverride;
66 }; 66 };
67 67
68 class FrameLoaderClientImplTest : public testing::Test { 68 class FrameLoaderClientImplTest : public testing::Test {
69 public: 69 public:
70 void SetUp() 70 void SetUp()
71 { 71 {
72 m_webView = WebView::create(0); 72 m_webView = WebView::create(0);
73 m_mainFrame = WebLocalFrame::create(&m_webFrameClient); 73 m_mainFrame = WebLocalFrame::create(&m_webFrameClient);
74 m_webView->setMainFrame(m_mainFrame); 74 m_webView->setMainFrame(m_mainFrame);
75 m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebFrameImpl(m_webVi ew->mainFrame())->frame()->loader().client()); 75 m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_ webView->mainFrame())->frame()->loader().client());
76 } 76 }
77 77
78 void TearDown() 78 void TearDown()
79 { 79 {
80 m_webView->close(); 80 m_webView->close();
81 m_mainFrame->close(); 81 m_mainFrame->close();
82 } 82 }
83 83
84 void setUserAgentOverride(const WebString& userAgent) 84 void setUserAgentOverride(const WebString& userAgent)
85 { 85 {
(...skipping 23 matching lines...) Expand all
109 // Override the user agent and make sure we get it back. 109 // Override the user agent and make sure we get it back.
110 setUserAgentOverride(override); 110 setUserAgentOverride(override);
111 EXPECT_TRUE(override.equals(userAgent())); 111 EXPECT_TRUE(override.equals(userAgent()));
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 setUserAgentOverride(WebString()); 114 setUserAgentOverride(WebString());
115 EXPECT_TRUE(defaultUserAgent.equals(userAgent())); 115 EXPECT_TRUE(defaultUserAgent.equals(userAgent()));
116 } 116 }
117 117
118 } // namespace 118 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/CustomEventTest.cpp ('k') | Source/web/tests/FrameTestHelpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698