| OLD | NEW |
| 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
| 12 #include "base/json/json_value_serializer.h" | 12 #include "base/json/json_string_value_serializer.h" |
| 13 #include "base/location.h" | 13 #include "base/location.h" |
| 14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 15 #include "base/string_piece.h" | 15 #include "base/string_piece.h" |
| 16 #include "chrome/browser/prefs/pref_model_associator.h" | 16 #include "chrome/browser/prefs/pref_model_associator.h" |
| 17 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 17 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 18 #include "chrome/browser/signin/signin_manager.h" | 18 #include "chrome/browser/signin/signin_manager.h" |
| 19 #include "chrome/browser/signin/signin_manager_factory.h" | 19 #include "chrome/browser/signin/signin_manager_factory.h" |
| 20 #include "chrome/browser/signin/token_service.h" | 20 #include "chrome/browser/signin/token_service.h" |
| 21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" | 21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" |
| 22 #include "chrome/browser/sync/api/sync_data.h" | 22 #include "chrome/browser/sync/api/sync_data.h" |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 EXPECT_FALSE(pref->IsDefaultValue()); | 585 EXPECT_FALSE(pref->IsDefaultValue()); |
| 586 // There should be no synced value. | 586 // There should be no synced value. |
| 587 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); | 587 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); |
| 588 // Switch kHomePage back to unmanaged. | 588 // Switch kHomePage back to unmanaged. |
| 589 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); | 589 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage); |
| 590 // The original value should be picked up. | 590 // The original value should be picked up. |
| 591 EXPECT_TRUE(pref->IsDefaultValue()); | 591 EXPECT_TRUE(pref->IsDefaultValue()); |
| 592 // There should still be no synced value. | 592 // There should still be no synced value. |
| 593 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); | 593 EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL); |
| 594 } | 594 } |
| OLD | NEW |