diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 04:05:07 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-22 04:05:07 +0000 |
| commit | 99e652fd299533d45c199f694f7b4d5f4d22d69c (patch) | |
| tree | 49bf91a1aaf8ec47a72f4550cfb0d78aa624dabf /chrome/browser/sync/profile_sync_service_mock.h | |
| parent | a1595312b958e430d54f55b7d93319d52da27d93 (diff) | |
| download | chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.zip chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.tar.gz chromium_src-99e652fd299533d45c199f694f7b4d5f4d22d69c.tar.bz2 | |
"Recommit 118589 - Re-commit r117965 and 117130 with a fix for perf regression."
This reverts commit 51e62c2c61ecde08d0e7cca563624184f634953f.
BUG=108017
TEST=none
TBR=tim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9138051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_mock.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h index 7c1d6c1..5987540 100644 --- a/chrome/browser/sync/profile_sync_service_mock.h +++ b/chrome/browser/sync/profile_sync_service_mock.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -20,6 +20,7 @@ class ProfileSyncServiceMock : public ProfileSyncService { public: + // no-arg constructor provided so TestingProfile can use NiceMock. ProfileSyncServiceMock(); explicit ProfileSyncServiceMock(Profile* profile); virtual ~ProfileSyncServiceMock(); |