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

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

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix compile Created 8 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
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/file_path.h" 8 #include "base/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/string_piece.h" 11 #include "base/string_piece.h"
12 12
13 namespace content {
14
13 TestContentClient::TestContentClient() 15 TestContentClient::TestContentClient()
14 : data_pack_(ui::SCALE_FACTOR_100P) { 16 : data_pack_(ui::SCALE_FACTOR_100P) {
15 // content_resources.pak is not built on iOS as it is not required. 17 // content_resources.pak is not built on iOS as it is not required.
16 #if !defined(OS_IOS) 18 #if !defined(OS_IOS)
17 FilePath content_resources_pack_path; 19 FilePath content_resources_pack_path;
18 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
19 // on Android all pak files are inside the paks folder. 21 // on Android all pak files are inside the paks folder.
20 PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path); 22 PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path);
21 content_resources_pack_path = content_resources_pack_path.Append( 23 content_resources_pack_path = content_resources_pack_path.Append(
22 FILE_PATH_LITERAL("paks")); 24 FILE_PATH_LITERAL("paks"));
(...skipping 13 matching lines...) Expand all
36 return std::string("TestContentClient"); 38 return std::string("TestContentClient");
37 } 39 }
38 40
39 base::StringPiece TestContentClient::GetDataResource( 41 base::StringPiece TestContentClient::GetDataResource(
40 int resource_id, 42 int resource_id,
41 ui::ScaleFactor scale_factor) const { 43 ui::ScaleFactor scale_factor) const {
42 base::StringPiece resource; 44 base::StringPiece resource;
43 data_pack_.GetStringPiece(resource_id, &resource); 45 data_pack_.GetStringPiece(resource_id, &resource);
44 return resource; 46 return resource;
45 } 47 }
48
49 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698