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

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

Issue 23506013: Make the embedder responsible for creating the WebFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix lifetime on frame detach Created 7 years, 2 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
« 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 private: 63 private:
64 WebString m_userAgentOverride; 64 WebString m_userAgentOverride;
65 }; 65 };
66 66
67 class FrameLoaderClientImplTest : public testing::Test { 67 class FrameLoaderClientImplTest : public testing::Test {
68 public: 68 public:
69 void SetUp() 69 void SetUp()
70 { 70 {
71 m_webView = WebView::create(0); 71 m_webView = WebView::create(0);
72 m_webView->initializeMainFrame(&m_webFrameClient); 72 m_mainFrame = WebFrame::create(&m_webFrameClient);
73 m_webView->setMainFrame(m_mainFrame);
73 m_frameLoaderClientImpl = static_cast<FrameLoaderClientImpl*>(toWebFrame Impl(m_webView->mainFrame())->frame()->loader()->client()); 74 m_frameLoaderClientImpl = static_cast<FrameLoaderClientImpl*>(toWebFrame Impl(m_webView->mainFrame())->frame()->loader()->client());
74 } 75 }
75 76
76 void TearDown() 77 void TearDown()
77 { 78 {
78 m_webView->close(); 79 m_webView->close();
80 m_mainFrame->close();
79 } 81 }
80 82
81 void setUserAgentOverride(const WebString& userAgent) 83 void setUserAgentOverride(const WebString& userAgent)
82 { 84 {
83 return m_webFrameClient.setUserAgentOverride(userAgent); 85 return m_webFrameClient.setUserAgentOverride(userAgent);
84 } 86 }
85 87
86 const WebString userAgent() 88 const WebString userAgent()
87 { 89 {
88 // The test always returns the same user agent, regardless of the URL pa ssed in. 90 // The test always returns the same user agent, regardless of the URL pa ssed in.
89 WebCore::KURL dummyURL(WebCore::ParsedURLString, "about:blank"); 91 WebCore::KURL dummyURL(WebCore::ParsedURLString, "about:blank");
90 WTF::CString userAgent = m_frameLoaderClientImpl->userAgent(dummyURL).ut f8(); 92 WTF::CString userAgent = m_frameLoaderClientImpl->userAgent(dummyURL).ut f8();
91 return WebString::fromUTF8(userAgent.data(), userAgent.length()); 93 return WebString::fromUTF8(userAgent.data(), userAgent.length());
92 } 94 }
93 95
94 protected: 96 protected:
95 TestWebFrameClient m_webFrameClient; 97 TestWebFrameClient m_webFrameClient;
96 FrameLoaderClientImpl* m_frameLoaderClientImpl; 98 FrameLoaderClientImpl* m_frameLoaderClientImpl;
97 WebView* m_webView; 99 WebView* m_webView;
100 WebFrame* m_mainFrame;
98 }; 101 };
99 102
100 TEST_F(FrameLoaderClientImplTest, UserAgentOverride) 103 TEST_F(FrameLoaderClientImplTest, UserAgentOverride)
101 { 104 {
102 const WebString defaultUserAgent = userAgent(); 105 const WebString defaultUserAgent = userAgent();
103 const WebString override = WebString::fromUTF8("dummy override"); 106 const WebString override = WebString::fromUTF8("dummy override");
104 107
105 // Override the user agent and make sure we get it back. 108 // Override the user agent and make sure we get it back.
106 setUserAgentOverride(override); 109 setUserAgentOverride(override);
107 EXPECT_TRUE(override.equals(userAgent())); 110 EXPECT_TRUE(override.equals(userAgent()));
108 111
109 // Remove the override and make sure we get the original back. 112 // Remove the override and make sure we get the original back.
110 setUserAgentOverride(WebString()); 113 setUserAgentOverride(WebString());
111 EXPECT_TRUE(defaultUserAgent.equals(userAgent())); 114 EXPECT_TRUE(defaultUserAgent.equals(userAgent()));
112 } 115 }
113 116
114 } // namespace 117 } // 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