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

Unified Diff: content/test/weburl_loader_mock_factory.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/test_web_contents_view.cc ('k') | content/worker/websharedworker_stub.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/weburl_loader_mock_factory.cc
diff --git a/content/test/weburl_loader_mock_factory.cc b/content/test/weburl_loader_mock_factory.cc
index 2c91e6f437e6a6c809458532c78fd5f9e4c78102..791ae1e18d255060deee11950c6630bc3e003848 100644
--- a/content/test/weburl_loader_mock_factory.cc
+++ b/content/test/weburl_loader_mock_factory.cc
@@ -39,7 +39,7 @@ void WebURLLoaderMockFactory::RegisterURL(const WebURL& url,
response_info.file_path =
base::FilePath(static_cast<std::string>(file_path.utf8()));
#elif defined(OS_WIN)
- string16 file_path_16 = file_path;
+ base::string16 file_path_16 = file_path;
response_info.file_path = base::FilePath(std::wstring(
file_path_16.data(), file_path_16.length()));
#endif
« no previous file with comments | « content/test/test_web_contents_view.cc ('k') | content/worker/websharedworker_stub.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698