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

Side by Side Diff: chrome/test/base/chrome_unit_test_suite.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/test/base/chrome_unit_test_suite.h" 5 #include "chrome/test/base/chrome_unit_test_suite.h"
6 6
7 #include "base/macros.h"
7 #include "base/path_service.h" 8 #include "base/path_service.h"
8 #include "base/process/process_handle.h" 9 #include "base/process/process_handle.h"
9 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "build/build_config.h"
10 #include "chrome/browser/chrome_content_browser_client.h" 12 #include "chrome/browser/chrome_content_browser_client.h"
11 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h" 13 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
12 #include "chrome/common/chrome_content_client.h" 14 #include "chrome/common/chrome_content_client.h"
13 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
14 #include "chrome/test/base/testing_browser_process.h" 16 #include "chrome/test/base/testing_browser_process.h"
15 #include "chrome/utility/chrome_content_utility_client.h" 17 #include "chrome/utility/chrome_content_utility_client.h"
16 #include "components/component_updater/component_updater_paths.h" 18 #include "components/component_updater/component_updater_paths.h"
17 #include "components/translate/content/browser/browser_cld_data_provider_factory .h" 19 #include "components/translate/content/browser/browser_cld_data_provider_factory .h"
18 #include "components/translate/content/common/cld_data_source.h" 20 #include "components/translate/content/common/cld_data_source.h"
19 #include "components/update_client/update_query_params.h" 21 #include "components/update_client/update_query_params.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 #if defined(OS_MACOSX) && !defined(OS_IOS) 163 #if defined(OS_MACOSX) && !defined(OS_IOS)
162 PathService::Get(base::DIR_MODULE, &resources_pack_path); 164 PathService::Get(base::DIR_MODULE, &resources_pack_path);
163 resources_pack_path = 165 resources_pack_path =
164 resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak")); 166 resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
165 #else 167 #else
166 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); 168 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
167 #endif 169 #endif
168 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 170 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
169 resources_pack_path, ui::SCALE_FACTOR_NONE); 171 resources_pack_path, ui::SCALE_FACTOR_NONE);
170 } 172 }
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_unit_test_suite.h ('k') | chrome/test/base/dialog_test_browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698