Commit 6721c58c authored by David Dorwin's avatar David Dorwin Committed by Commit Bot

[fuchsia] Remove FILE_PATH_LITERAL() from Fuchsia code

Fuchsia-specific code does not need to be compatible with Windows.

Change-Id: I6dc72f36a261f4d3f50936ddde712640675b2ec2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427845
Auto-Submit: David Dorwin <ddorwin@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: default avatarKevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810264}
parent 75450a45
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
namespace cr_fuchsia { namespace cr_fuchsia {
const char kTestServerRoot[] = FILE_PATH_LITERAL("fuchsia/engine/test/data"); const char kTestServerRoot[] = "fuchsia/engine/test/data";
} // namespace cr_fuchsia } // namespace cr_fuchsia
\ No newline at end of file
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
namespace { namespace {
const char kTestServerRoot[] = FILE_PATH_LITERAL("fuchsia/engine/test/data"); const char kTestServerRoot[] = "fuchsia/engine/test/data";
} // namespace } // namespace
......
...@@ -28,7 +28,7 @@ void InitializeResourceBundle() { ...@@ -28,7 +28,7 @@ void InitializeResourceBundle() {
base::FilePath pak_file; base::FilePath pak_file;
bool result = base::PathService::Get(base::DIR_ASSETS, &pak_file); bool result = base::PathService::Get(base::DIR_ASSETS, &pak_file);
DCHECK(result); DCHECK(result);
pak_file = pak_file.Append(FILE_PATH_LITERAL("web_engine.pak")); pak_file = pak_file.Append("web_engine.pak");
ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file); ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
} }
......
...@@ -19,8 +19,7 @@ namespace oldhttp = ::fuchsia::net::oldhttp; ...@@ -19,8 +19,7 @@ namespace oldhttp = ::fuchsia::net::oldhttp;
namespace { namespace {
const base::FilePath::CharType kTestFilePath[] = const base::FilePath::CharType kTestFilePath[] = "fuchsia/http/testdata";
FILE_PATH_LITERAL("fuchsia/http/testdata");
// Capacity, in bytes, for buffers used to read data off the URLResponse. // Capacity, in bytes, for buffers used to read data off the URLResponse.
const size_t kBufferCapacity = 1024; const size_t kBufferCapacity = 1024;
...@@ -33,8 +32,7 @@ class HttpServiceTest : public ::testing::Test { ...@@ -33,8 +32,7 @@ class HttpServiceTest : public ::testing::Test {
: task_environment_(base::test::TaskEnvironment::MainThreadType::IO), : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
binding_(&http_service_server_) { binding_(&http_service_server_) {
// Initialize the test server. // Initialize the test server.
test_server_.AddDefaultHandlers( test_server_.AddDefaultHandlers(base::FilePath(kTestFilePath));
base::FilePath(FILE_PATH_LITERAL(kTestFilePath)));
net::test_server::RegisterDefaultHandlers(&test_server_); net::test_server::RegisterDefaultHandlers(&test_server_);
} }
......
...@@ -56,8 +56,7 @@ constexpr char kSecondTestAppId[] = "FFFFFFFF"; ...@@ -56,8 +56,7 @@ constexpr char kSecondTestAppId[] = "FFFFFFFF";
constexpr char kBlankAppUrl[] = "/defaultresponse"; constexpr char kBlankAppUrl[] = "/defaultresponse";
constexpr char kEchoHeaderPath[] = "/echoheader?Test"; constexpr char kEchoHeaderPath[] = "/echoheader?Test";
constexpr char kTestServerRoot[] = constexpr char kTestServerRoot[] = "fuchsia/runners/cast/testdata";
FILE_PATH_LITERAL("fuchsia/runners/cast/testdata");
constexpr char kDummyAgentUrl[] = constexpr char kDummyAgentUrl[] =
"fuchsia-pkg://fuchsia.com/dummy_agent#meta/dummy_agent.cmx"; "fuchsia-pkg://fuchsia.com/dummy_agent#meta/dummy_agent.cmx";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment