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

Side by Side Diff: third_party/WebKit/Source/web/tests/PrerenderingTest.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 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return WebURL(toKURL(url)); 58 return WebURL(toKURL(url));
59 } 59 }
60 60
61 class TestPrerendererClient : public WebPrerendererClient { 61 class TestPrerendererClient : public WebPrerendererClient {
62 public: 62 public:
63 TestPrerendererClient() {} 63 TestPrerendererClient() {}
64 virtual ~TestPrerendererClient() {} 64 virtual ~TestPrerendererClient() {}
65 65
66 void setExtraDataForNextPrerender(WebPrerender::ExtraData* extraData) { 66 void setExtraDataForNextPrerender(WebPrerender::ExtraData* extraData) {
67 DCHECK(!m_extraData); 67 DCHECK(!m_extraData);
68 m_extraData = wrapUnique(extraData); 68 m_extraData = WTF::wrapUnique(extraData);
69 } 69 }
70 70
71 WebPrerender releaseWebPrerender() { 71 WebPrerender releaseWebPrerender() {
72 DCHECK(!m_webPrerenders.empty()); 72 DCHECK(!m_webPrerenders.empty());
73 WebPrerender retval(m_webPrerenders.front()); 73 WebPrerender retval(m_webPrerenders.front());
74 m_webPrerenders.pop_front(); 74 m_webPrerenders.pop_front();
75 return retval; 75 return retval;
76 } 76 }
77 77
78 bool empty() const { return m_webPrerenders.empty(); } 78 bool empty() const { return m_webPrerenders.empty(); }
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 464
465 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender(); 465 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender();
466 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), 466 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"),
467 relNextAndPrerender.url()); 467 relNextAndPrerender.url());
468 EXPECT_EQ( 468 EXPECT_EQ(
469 static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender), 469 static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender),
470 relNextAndPrerender.relTypes()); 470 relNextAndPrerender.relTypes());
471 } 471 }
472 472
473 } // namespace 473 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698