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

Side by Side Diff: third_party/WebKit/Source/web/LinkHighlightImplTest.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 webViewImpl->updateAllLifecyclePhases(); 178 webViewImpl->updateAllLifecyclePhases();
179 ASSERT_EQ(0U, highlightLayer->numLinkHighlights()); 179 ASSERT_EQ(0U, highlightLayer->numLinkHighlights());
180 180
181 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); 181 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
182 WebCache::clear(); 182 WebCache::clear();
183 } 183 }
184 184
185 // A lifetime test: delete LayerTreeView while running LinkHighlights. 185 // A lifetime test: delete LayerTreeView while running LinkHighlights.
186 TEST(LinkHighlightImplTest, resetLayerTreeView) { 186 TEST(LinkHighlightImplTest, resetLayerTreeView) {
187 std::unique_ptr<FakeCompositingWebViewClient> webViewClient = 187 std::unique_ptr<FakeCompositingWebViewClient> webViewClient =
188 makeUnique<FakeCompositingWebViewClient>(); 188 WTF::makeUnique<FakeCompositingWebViewClient>();
189 189
190 const std::string baseURL("http://www.test.com/"); 190 const std::string baseURL("http://www.test.com/");
191 const std::string fileName("test_touch_link_highlight.html"); 191 const std::string fileName("test_touch_link_highlight.html");
192 192
193 URLTestHelpers::registerMockedURLFromBaseURL( 193 URLTestHelpers::registerMockedURLFromBaseURL(
194 WebString::fromUTF8(baseURL.c_str()), 194 WebString::fromUTF8(baseURL.c_str()),
195 WebString::fromUTF8("test_touch_link_highlight.html")); 195 WebString::fromUTF8("test_touch_link_highlight.html"));
196 FrameTestHelpers::WebViewHelper webViewHelper; 196 FrameTestHelpers::WebViewHelper webViewHelper;
197 WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad( 197 WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
198 baseURL + fileName, true, 0, webViewClient.get()); 198 baseURL + fileName, true, 0, webViewClient.get());
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 goodTargets, highlightNodes); 260 goodTargets, highlightNodes);
261 261
262 webViewImpl->enableTapHighlights(highlightNodes); 262 webViewImpl->enableTapHighlights(highlightNodes);
263 EXPECT_EQ(2U, webViewImpl->numLinkHighlights()); 263 EXPECT_EQ(2U, webViewImpl->numLinkHighlights());
264 264
265 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); 265 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
266 WebCache::clear(); 266 WebCache::clear();
267 } 267 }
268 268
269 } // namespace blink 269 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/LinkHighlightImpl.cpp ('k') | third_party/WebKit/Source/web/LocalFileSystemClient.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698