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

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

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « Source/web/tests/URLTestHelpers.h ('k') | Source/web/tests/ViewportTest.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 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "URLTestHelpers.h" 32 #include "URLTestHelpers.h"
33 33
34 #include "public/platform/Platform.h" 34 #include "public/platform/Platform.h"
35 #include "public/platform/WebString.h" 35 #include "public/platform/WebString.h"
36 #include "public/platform/WebURL.h" 36 #include "public/platform/WebURL.h"
37 #include "public/platform/WebURLResponse.h" 37 #include "public/platform/WebURLResponse.h"
38 #include "public/platform/WebUnitTestSupport.h" 38 #include "public/platform/WebUnitTestSupport.h"
39 39
40 namespace WebKit { 40 namespace blink {
41 namespace URLTestHelpers { 41 namespace URLTestHelpers {
42 42
43 void registerMockedURLFromBaseURL(const WebString& baseURL, const WebString& fil eName, const WebString& mimeType) 43 void registerMockedURLFromBaseURL(const WebString& baseURL, const WebString& fil eName, const WebString& mimeType)
44 { 44 {
45 // fullURL = baseURL + fileName. 45 // fullURL = baseURL + fileName.
46 std::string fullString = std::string(baseURL.utf8().data()) + std::string(fi leName.utf8().data()); 46 std::string fullString = std::string(baseURL.utf8().data()) + std::string(fi leName.utf8().data());
47 registerMockedURLLoad(toKURL(fullString.c_str()), fileName, WebString::fromU TF8(""), mimeType); 47 registerMockedURLLoad(toKURL(fullString.c_str()), fileName, WebString::fromU TF8(""), mimeType);
48 } 48 }
49 49
50 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& mimeType) 50 void registerMockedURLLoad(const WebURL& fullURL, const WebString& fileName, con st WebString& mimeType)
(...skipping 11 matching lines...) Expand all
62 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName. 62 // Physical file path for the mock = <webkitRootDir> + relativeBaseDirectory + fileName.
63 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data()); 63 std::string filePath = std::string(Platform::current()->unitTestSupport()->w ebKitRootDir().utf8().data());
64 filePath.append("/Source/web/tests/data/"); 64 filePath.append("/Source/web/tests/data/");
65 filePath.append(std::string(relativeBaseDirectory.utf8().data())); 65 filePath.append(std::string(relativeBaseDirectory.utf8().data()));
66 filePath.append(std::string(fileName.utf8().data())); 66 filePath.append(std::string(fileName.utf8().data()));
67 67
68 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str())); 68 Platform::current()->unitTestSupport()->registerMockedURL(fullURL, response, WebString::fromUTF8(filePath.c_str()));
69 } 69 }
70 70
71 } // namespace URLTestHelpers 71 } // namespace URLTestHelpers
72 } // namespace WebKit 72 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/tests/URLTestHelpers.h ('k') | Source/web/tests/ViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698