diff options
| author | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 21:05:55 +0000 |
|---|---|---|
| committer | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 21:05:55 +0000 |
| commit | c2a373e2a05614bc520c9c44adb741201037c9d1 (patch) | |
| tree | dcf1b14586b061b217f1ad92751b2a3130244c34 | |
| parent | 7a40f86e73875315d476a2ceca4b42929b0ce99d (diff) | |
| download | chromium_src-c2a373e2a05614bc520c9c44adb741201037c9d1.zip chromium_src-c2a373e2a05614bc520c9c44adb741201037c9d1.tar.gz chromium_src-c2a373e2a05614bc520c9c44adb741201037c9d1.tar.bz2 | |
tweaks
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53517 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/cros/fake_mount_library.h | 2 | ||||
| -rw-r--r-- | chrome/browser/profile_manager.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/cros/fake_mount_library.h b/chrome/browser/chromeos/cros/fake_mount_library.h index 4f99761..4fea9ad 100644 --- a/chrome/browser/chromeos/cros/fake_mount_library.h +++ b/chrome/browser/chromeos/cros/fake_mount_library.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc index 4f6ec85..8770b1d 100644 --- a/chrome/browser/profile_manager.cc +++ b/chrome/browser/profile_manager.cc @@ -135,8 +135,8 @@ Profile* ProfileManager::GetDefaultProfile(const FilePath& user_data_dir) { // many of the browser and ui tests fail. We do return the OTR profile // if the login-profile switch is passed so that we can test this. // TODO(davemoore) Fix the tests so they allow OTR profiles. - if (false && (!command_line.HasSwitch(switches::kTestType) || - command_line.HasSwitch(switches::kLoginProfile))) { + if (!command_line.HasSwitch(switches::kTestType) || + command_line.HasSwitch(switches::kLoginProfile)) { // Don't init extensions for this profile profile = GetProfile(default_profile_dir, false); profile = profile->GetOffTheRecordProfile(); |