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

Side by Side Diff: chrome/browser/extensions/extension_startup_browsertest.cc

Issue 1237873004: Revert of Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 (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 <vector> 5 #include <vector>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 base::StringPrintf( 60 base::StringPrintf(
61 "%s/%s/", 61 "%s/%s/",
62 chrome_prefs::internals::kSettingsEnforcementTrialName, 62 chrome_prefs::internals::kSettingsEnforcementTrialName,
63 chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement)); 63 chrome_prefs::internals::kSettingsEnforcementGroupNoEnforcement));
64 #if defined(OFFICIAL_BUILD) && defined(OS_WIN) 64 #if defined(OFFICIAL_BUILD) && defined(OS_WIN)
65 // In Windows official builds, it is not possible to disable settings 65 // In Windows official builds, it is not possible to disable settings
66 // authentication. 66 // authentication.
67 unauthenticated_load_allowed_ = false; 67 unauthenticated_load_allowed_ = false;
68 #endif 68 #endif
69 } else { 69 } else {
70 base::FilePath::StringType paths = 70 base::FilePath::StringType paths = JoinString(load_extensions_, ',');
71 base::JoinString(load_extensions_,
72 base::FilePath::StringType(1, ','));
73 command_line->AppendSwitchNative(switches::kLoadExtension, 71 command_line->AppendSwitchNative(switches::kLoadExtension,
74 paths); 72 paths);
75 command_line->AppendSwitch(switches::kDisableExtensionsFileAccessCheck); 73 command_line->AppendSwitch(switches::kDisableExtensionsFileAccessCheck);
76 } 74 }
77 } 75 }
78 76
79 bool SetUpUserDataDirectory() override { 77 bool SetUpUserDataDirectory() override {
80 base::FilePath profile_dir; 78 base::FilePath profile_dir;
81 PathService::Get(chrome::DIR_USER_DATA, &profile_dir); 79 PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
82 profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir); 80 profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir);
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 .AppendASCII("extensions") 297 .AppendASCII("extensions")
300 .AppendASCII("app2"); 298 .AppendASCII("app2");
301 load_extensions_.push_back(fourth_extension_path.value()); 299 load_extensions_.push_back(fourth_extension_path.value());
302 } 300 }
303 }; 301 };
304 302
305 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) { 303 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) {
306 WaitForServicesToStart(4, true); 304 WaitForServicesToStart(4, true);
307 TestInjection(true, true); 305 TestInjection(true, true);
308 } 306 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/extensions/requirements_checker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698