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

Side by Side Diff: content/test/test_content_client.cc

Issue 456413002: Move the user agent styles sheets to blink_resources.grd (Part 2) with Unit test support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch after rebased! Created 6 years, 3 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 | « content/test/blink_test_environment.cc ('k') | content/test/test_webkit_platform_support.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/test_content_client.h" 5 #include "content/test/test_content_client.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 TestContentClient::TestContentClient() 15 TestContentClient::TestContentClient()
16 : data_pack_(ui::SCALE_FACTOR_100P) { 16 : data_pack_(ui::SCALE_FACTOR_100P) {
17 // content_resources.pak is not built on iOS as it is not required. 17 // content_shell.pak is not built on iOS as it is not required.
18 #if !defined(OS_IOS) 18 #if !defined(OS_IOS)
19 base::FilePath content_resources_pack_path; 19 base::FilePath content_shell_pack_path;
20 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
21 // on Android all pak files are inside the paks folder. 21 // on Android all pak files are inside the paks folder.
22 PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path); 22 PathService::Get(base::DIR_ANDROID_APP_DATA, &content_shell_pack_path);
23 content_resources_pack_path = content_resources_pack_path.Append( 23 content_shell_pack_path = content_shell_pack_path.Append(
24 FILE_PATH_LITERAL("paks")); 24 FILE_PATH_LITERAL("paks"));
25 #else 25 #else
26 PathService::Get(base::DIR_MODULE, &content_resources_pack_path); 26 PathService::Get(base::DIR_MODULE, &content_shell_pack_path);
27 #endif 27 #endif
28 content_resources_pack_path = content_resources_pack_path.Append( 28 content_shell_pack_path = content_shell_pack_path.Append(
29 FILE_PATH_LITERAL("content_resources.pak")); 29 FILE_PATH_LITERAL("content_shell.pak"));
30 data_pack_.LoadFromPath(content_resources_pack_path); 30 data_pack_.LoadFromPath(content_shell_pack_path);
31 #endif 31 #endif
32 } 32 }
33 33
34 TestContentClient::~TestContentClient() { 34 TestContentClient::~TestContentClient() {
35 } 35 }
36 36
37 std::string TestContentClient::GetUserAgent() const { 37 std::string TestContentClient::GetUserAgent() const {
38 return std::string("TestContentClient"); 38 return std::string("TestContentClient");
39 } 39 }
40 40
41 base::StringPiece TestContentClient::GetDataResource( 41 base::StringPiece TestContentClient::GetDataResource(
42 int resource_id, 42 int resource_id,
43 ui::ScaleFactor scale_factor) const { 43 ui::ScaleFactor scale_factor) const {
44 base::StringPiece resource; 44 base::StringPiece resource;
45 data_pack_.GetStringPiece(resource_id, &resource); 45 data_pack_.GetStringPiece(resource_id, &resource);
46 return resource; 46 return resource;
47 } 47 }
48 48
49 } // namespace content 49 } // namespace content
OLDNEW
« no previous file with comments | « content/test/blink_test_environment.cc ('k') | content/test/test_webkit_platform_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698