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

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

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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/base/testing_profile_manager.h ('k') | chrome/test/base/ui_test_utils.h » ('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 "chrome/test/base/testing_profile_manager.h" 5 #include "chrome/test/base/testing_profile_manager.h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_special_storage_policy.h" 9 #include "chrome/browser/extensions/extension_special_storage_policy.h"
10 #include "chrome/browser/prefs/pref_service_syncable.h" 10 #include "chrome/browser/prefs/pref_service_syncable.h"
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 bool TestingProfileManager::SetUp() { 43 bool TestingProfileManager::SetUp() {
44 SetUpInternal(); 44 SetUpInternal();
45 return called_set_up_; 45 return called_set_up_;
46 } 46 }
47 47
48 TestingProfile* TestingProfileManager::CreateTestingProfile( 48 TestingProfile* TestingProfileManager::CreateTestingProfile(
49 const std::string& profile_name, 49 const std::string& profile_name,
50 scoped_ptr<PrefServiceSyncable> prefs, 50 scoped_ptr<PrefServiceSyncable> prefs,
51 const string16& user_name, 51 const base::string16& user_name,
52 int avatar_id, 52 int avatar_id,
53 const std::string& managed_user_id, 53 const std::string& managed_user_id,
54 const TestingProfile::TestingFactories& factories) { 54 const TestingProfile::TestingFactories& factories) {
55 DCHECK(called_set_up_); 55 DCHECK(called_set_up_);
56 56
57 // Create a path for the profile based on the name. 57 // Create a path for the profile based on the name.
58 base::FilePath profile_path(profiles_dir_.path()); 58 base::FilePath profile_path(profiles_dir_.path());
59 profile_path = profile_path.AppendASCII(profile_name); 59 profile_path = profile_path.AppendASCII(profile_name);
60 60
61 // Create the profile and register it. 61 // Create the profile and register it.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 << "ProfileManager already exists"; 165 << "ProfileManager already exists";
166 166
167 // Set up the directory for profiles. 167 // Set up the directory for profiles.
168 ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir()); 168 ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());
169 169
170 profile_manager_ = new testing::ProfileManager(profiles_dir_.path()); 170 profile_manager_ = new testing::ProfileManager(profiles_dir_.path());
171 browser_process_->SetProfileManager(profile_manager_); // Takes ownership. 171 browser_process_->SetProfileManager(profile_manager_); // Takes ownership.
172 172
173 called_set_up_ = true; 173 called_set_up_ = true;
174 } 174 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile_manager.h ('k') | chrome/test/base/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698