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

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

Issue 10928017: Moving google_apis and GaiaClient to src/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 3 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 | Annotate | Revision Log
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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/signin/signin_manager.h" 9 #include "chrome/browser/signin/signin_manager.h"
10 #include "chrome/browser/signin/signin_manager_factory.h" 10 #include "chrome/browser/signin/signin_manager_factory.h"
11 #include "chrome/browser/signin/token_service.h" 11 #include "chrome/browser/signin/token_service.h"
12 #include "chrome/browser/signin/token_service_factory.h" 12 #include "chrome/browser/signin/token_service_factory.h"
13 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h" 13 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
14 #include "chrome/browser/sync/glue/data_type_controller.h" 14 #include "chrome/browser/sync/glue/data_type_controller.h"
15 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" 15 #include "chrome/browser/sync/profile_sync_components_factory_mock.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/chrome_version_info.h" 17 #include "chrome/common/chrome_version_info.h"
18 #include "chrome/common/net/gaia/gaia_constants.h"
19 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
20 #include "chrome/test/base/testing_pref_service.h" 19 #include "chrome/test/base/testing_pref_service.h"
21 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
22 #include "content/public/common/content_client.h" 21 #include "content/public/common/content_client.h"
23 #include "content/public/test/test_browser_thread.h" 22 #include "content/public/test/test_browser_thread.h"
24 #include "google/cacheinvalidation/include/types.h" 23 #include "google/cacheinvalidation/include/types.h"
24 #include "google_apis/gaia/gaia_constants.h"
25 #include "sync/js/js_arg_list.h" 25 #include "sync/js/js_arg_list.h"
26 #include "sync/js/js_event_details.h" 26 #include "sync/js/js_event_details.h"
27 #include "sync/js/js_test_util.h" 27 #include "sync/js/js_test_util.h"
28 #include "sync/notifier/fake_invalidation_handler.h" 28 #include "sync/notifier/fake_invalidation_handler.h"
29 #include "sync/notifier/object_id_state_map_test_util.h" 29 #include "sync/notifier/object_id_state_map_test_util.h"
30 #include "testing/gmock/include/gmock/gmock.h" 30 #include "testing/gmock/include/gmock/gmock.h"
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 #include "webkit/glue/webkit_glue.h" 32 #include "webkit/glue/webkit_glue.h"
33 33
34 // TODO(akalin): Add tests here that exercise the whole 34 // TODO(akalin): Add tests here that exercise the whole
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 EXPECT_THAT(states, Eq(handler.GetLastNotificationIdStateMap())); 442 EXPECT_THAT(states, Eq(handler.GetLastNotificationIdStateMap()));
443 EXPECT_EQ(syncer::REMOTE_NOTIFICATION, handler.GetLastNotificationSource()); 443 EXPECT_EQ(syncer::REMOTE_NOTIFICATION, handler.GetLastNotificationSource());
444 444
445 backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR); 445 backend->EmitOnNotificationsDisabled(syncer::TRANSIENT_NOTIFICATION_ERROR);
446 EXPECT_EQ(syncer::TRANSIENT_NOTIFICATION_ERROR, 446 EXPECT_EQ(syncer::TRANSIENT_NOTIFICATION_ERROR,
447 handler.GetNotificationsDisabledReason()); 447 handler.GetNotificationsDisabledReason());
448 } 448 }
449 449
450 } // namespace 450 } // namespace
451 } // namespace browser_sync 451 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/sync/sync_global_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698