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

Side by Side Diff: chrome/browser/sync/profile_sync_service_startup_unittest.cc

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/scoped_ptr.h" 8 #include "base/scoped_ptr.h"
9 #include "chrome/browser/chrome_thread.h" 9 #include "chrome/browser/chrome_thread.h"
10 #include "chrome/browser/net/gaia/token_service.h" 10 #include "chrome/browser/net/gaia/token_service.h"
11 #include "chrome/browser/pref_service.h" 11 #include "chrome/browser/prefs/pref_service.h"
12 #include "chrome/browser/sync/glue/data_type_manager.h" 12 #include "chrome/browser/sync/glue/data_type_manager.h"
13 #include "chrome/browser/sync/glue/data_type_manager_mock.h" 13 #include "chrome/browser/sync/glue/data_type_manager_mock.h"
14 #include "chrome/browser/sync/profile_sync_factory_mock.h" 14 #include "chrome/browser/sync/profile_sync_factory_mock.h"
15 #include "chrome/browser/sync/profile_sync_test_util.h" 15 #include "chrome/browser/sync/profile_sync_test_util.h"
16 #include "chrome/browser/sync/test_profile_sync_service.h" 16 #include "chrome/browser/sync/test_profile_sync_service.h"
17 #include "chrome/common/net/gaia/gaia_auth_consumer.h" 17 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
18 #include "chrome/common/notification_type.h" 18 #include "chrome/common/notification_type.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "chrome/test/testing_profile.h" 20 #include "chrome/test/testing_profile.h"
21 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 result.sid = "sid"; 205 result.sid = "sid";
206 result.lsid = "lsid"; 206 result.lsid = "lsid";
207 profile_.GetTokenService()->Initialize("test", 207 profile_.GetTokenService()->Initialize("test",
208 &profile_); 208 &profile_);
209 profile_.GetTokenService()->UpdateCredentials(result); 209 profile_.GetTokenService()->UpdateCredentials(result);
210 210
211 // Will start sync even though setup hasn't been completed (since 211 // Will start sync even though setup hasn't been completed (since
212 // setup is bypassed when bootstrapping is enabled). 212 // setup is bypassed when bootstrapping is enabled).
213 service_->Initialize(); 213 service_->Initialize();
214 } 214 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698