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

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

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 6503 matching lines...) Expand 10 before | Expand all | Expand 10 after
6514 webViewHelper.initializeAndLoad(m_baseURL + "link-manifest-change.html", tru e, &webFrameClient); 6514 webViewHelper.initializeAndLoad(m_baseURL + "link-manifest-change.html", tru e, &webFrameClient);
6515 6515
6516 EXPECT_EQ(14, webFrameClient.manifestChangeCount()); 6516 EXPECT_EQ(14, webFrameClient.manifestChangeCount());
6517 } 6517 }
6518 6518
6519 static ResourcePtr<Resource> fetchManifest(Document* document, const KURL& url) 6519 static ResourcePtr<Resource> fetchManifest(Document* document, const KURL& url)
6520 { 6520 {
6521 FetchRequest fetchRequest = FetchRequest(ResourceRequest(url), FetchInitiato rInfo()); 6521 FetchRequest fetchRequest = FetchRequest(ResourceRequest(url), FetchInitiato rInfo());
6522 fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::Reque stContextManifest); 6522 fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::Reque stContextManifest);
6523 6523
6524 return document->fetcher()->fetchSynchronously(fetchRequest); 6524 return RawResource::fetchSynchronously(fetchRequest, document->fetcher());
6525 } 6525 }
6526 6526
6527 TEST_P(ParametrizedWebFrameTest, ManifestFetch) 6527 TEST_P(ParametrizedWebFrameTest, ManifestFetch)
6528 { 6528 {
6529 registerMockedHttpURLLoad("foo.html"); 6529 registerMockedHttpURLLoad("foo.html");
6530 registerMockedHttpURLLoad("link-manifest-fetch.json"); 6530 registerMockedHttpURLLoad("link-manifest-fetch.json");
6531 6531
6532 FrameTestHelpers::WebViewHelper webViewHelper(this); 6532 FrameTestHelpers::WebViewHelper webViewHelper(this);
6533 webViewHelper.initializeAndLoad(m_baseURL + "foo.html"); 6533 webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
6534 Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFr ame())->frame()->document(); 6534 Document* document = toWebLocalFrameImpl(webViewHelper.webViewImpl()->mainFr ame())->frame()->document();
(...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after
7431 7431
7432 EXPECT_EQ(parent, firstFrame->parent()); 7432 EXPECT_EQ(parent, firstFrame->parent());
7433 EXPECT_EQ(parent, secondFrame->parent()); 7433 EXPECT_EQ(parent, secondFrame->parent());
7434 EXPECT_EQ(parent, thirdFrame->parent()); 7434 EXPECT_EQ(parent, thirdFrame->parent());
7435 EXPECT_EQ(parent, fourthFrame->parent()); 7435 EXPECT_EQ(parent, fourthFrame->parent());
7436 7436
7437 view->close(); 7437 view->close();
7438 } 7438 }
7439 7439
7440 } // namespace blink 7440 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698