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

Side by Side Diff: sky/engine/core/testing/URLTestHelpers.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
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
« no previous file with comments | « sky/engine/core/testing/NullExecutionContext.cpp ('k') | sky/engine/core/view/View.cpp » ('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) 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 10 matching lines...) Expand all
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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 "sky/engine/config.h"
32 #include "core/testing/URLTestHelpers.h" 31 #include "core/testing/URLTestHelpers.h"
33 32
34 #include "sky/engine/public/platform/Platform.h" 33 #include "sky/engine/public/platform/Platform.h"
35 #include "sky/engine/public/platform/WebURL.h" 34 #include "sky/engine/public/platform/WebURL.h"
36 #include "sky/engine/public/platform/WebURLResponse.h" 35 #include "sky/engine/public/platform/WebURLResponse.h"
37 #include "sky/engine/public/platform/WebUnitTestSupport.h" 36 #include "sky/engine/public/platform/WebUnitTestSupport.h"
38 37
39 namespace blink { 38 namespace blink {
40 namespace URLTestHelpers { 39 namespace URLTestHelpers {
41 40
(...skipping 19 matching lines...) Expand all
61 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data()); 60 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data());
62 filePath.append("/engine/web/tests/data/"); 61 filePath.append("/engine/web/tests/data/");
63 filePath.append(std::string(relativeBaseDirectory.utf8().data())); 62 filePath.append(std::string(relativeBaseDirectory.utf8().data()));
64 filePath.append(std::string(fileName.utf8().data())); 63 filePath.append(std::string(fileName.utf8().data()));
65 64
66 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str())); 65 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str()));
67 } 66 }
68 67
69 } // namespace URLTestHelpers 68 } // namespace URLTestHelpers
70 } // namespace blink 69 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/testing/NullExecutionContext.cpp ('k') | sky/engine/core/view/View.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698