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

Side by Side Diff: chrome/test/unit/chrome_test_suite.h

Issue 126223: Replace std:;wstring with std::string in locale-name related APIs.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #ifndef CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_ 5 #ifndef CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
6 #define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_ 6 #define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <string> 10 #include <string>
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 PathService::Override(chrome::DIR_USER_DATA, 94 PathService::Override(chrome::DIR_USER_DATA,
95 user_data_dir.ToWStringHack()); 95 user_data_dir.ToWStringHack());
96 96
97 #if defined(OS_MACOSX) 97 #if defined(OS_MACOSX)
98 FilePath path; 98 FilePath path;
99 PathService::Get(base::DIR_EXE, &path); 99 PathService::Get(base::DIR_EXE, &path);
100 path = path.AppendASCII(MAC_BROWSER_APP_NAME); 100 path = path.AppendASCII(MAC_BROWSER_APP_NAME);
101 mac_util::SetOverrideAppBundlePath(path); 101 mac_util::SetOverrideAppBundlePath(path);
102 #endif 102 #endif
103 103
104 // Force unittests to run using en-us so if we test against string 104 // Force unittests to run using en-US so if we test against string
105 // output, it'll pass regardless of the system language. 105 // output, it'll pass regardless of the system language.
106 ResourceBundle::InitSharedInstance(L"en-us"); 106 ResourceBundle::InitSharedInstance(L"en-US");
107 ResourceBundle::GetSharedInstance().LoadThemeResources(); 107 ResourceBundle::GetSharedInstance().LoadThemeResources();
108 108
109 // initialize the global StatsTable for unit_tests 109 // initialize the global StatsTable for unit_tests
110 std::string statsfile = "unit_tests"; 110 std::string statsfile = "unit_tests";
111 std::string pid_string = StringPrintf("-%d", base::GetCurrentProcId()); 111 std::string pid_string = StringPrintf("-%d", base::GetCurrentProcId());
112 statsfile += pid_string; 112 statsfile += pid_string;
113 stats_table_ = new StatsTable(statsfile, 20, 200); 113 stats_table_ = new StatsTable(statsfile, 20, 200);
114 StatsTable::set_current(stats_table_); 114 StatsTable::set_current(stats_table_);
115 } 115 }
116 116
(...skipping 21 matching lines...) Expand all
138 TestSuite::Shutdown(); 138 TestSuite::Shutdown();
139 } 139 }
140 140
141 StatsTable* stats_table_; 141 StatsTable* stats_table_;
142 ScopedOleInitializer ole_initializer_; 142 ScopedOleInitializer ole_initializer_;
143 scoped_refptr<WarningHostMapper> host_mapper_; 143 scoped_refptr<WarningHostMapper> host_mapper_;
144 net::ScopedHostMapper scoped_host_mapper_; 144 net::ScopedHostMapper scoped_host_mapper_;
145 }; 145 };
146 146
147 #endif // CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_ 147 #endif // CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698