diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 05:19:46 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 05:19:46 +0000 |
| commit | e4a739bbe7eceebc94ff9233e4b1614995e3fbcd (patch) | |
| tree | 714964744a87e3ec5bc3a8baa8b5d7450f551b79 /chrome/browser/extensions/app_notify_channel_setup_unittest.cc | |
| parent | a97895c126f6e7afef08c3e58fe454d2ec3944c0 (diff) | |
| download | chromium_src-e4a739bbe7eceebc94ff9233e4b1614995e3fbcd.zip chromium_src-e4a739bbe7eceebc94ff9233e4b1614995e3fbcd.tar.gz chromium_src-e4a739bbe7eceebc94ff9233e4b1614995e3fbcd.tar.bz2 | |
Revert 118589 - Re-commit r117965 and 117130 with a prospective fix for perf regression.
Reverting due to linux sync integration test crashes, and a memory leak.
BUG=108017
TEST=none
TBR=tim@chromium.org,jamesr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9141027
TBR=atwilson@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9226042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_notify_channel_setup_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/app_notify_channel_setup_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc index 543d243..063da55 100644 --- a/chrome/browser/extensions/app_notify_channel_setup_unittest.cc +++ b/chrome/browser/extensions/app_notify_channel_setup_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -9,8 +9,8 @@ #include "base/message_loop.h" #include "chrome/browser/extensions/app_notify_channel_setup.h" #include "chrome/browser/extensions/app_notify_channel_ui.h" -#include "chrome/browser/signin/token_service.h" -#include "chrome/browser/signin/token_service_unittest.h" +#include "chrome/browser/net/gaia/token_service.h" +#include "chrome/browser/net/gaia/token_service_unittest.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_urls.h" #include "chrome/common/pref_names.h" |