| OLD | NEW |
| 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 "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
| 6 | 6 |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/browser_thread.h" | |
| 9 #include "chrome/browser/dom_ui/new_tab_ui.h" | 8 #include "chrome/browser/dom_ui/new_tab_ui.h" |
| 10 #include "chrome/browser/prefs/pref_value_store.h" | 9 #include "chrome/browser/prefs/pref_value_store.h" |
| 11 #include "chrome/browser/sync/signin_manager.h" | 10 #include "chrome/browser/sync/signin_manager.h" |
| 12 #include "chrome/common/json_pref_store.h" | 11 #include "chrome/common/json_pref_store.h" |
| 13 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 14 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
| 15 #include "chrome/test/automation/browser_proxy.h" | 14 #include "chrome/test/automation/browser_proxy.h" |
| 16 #include "chrome/test/automation/tab_proxy.h" | 15 #include "chrome/test/automation/tab_proxy.h" |
| 17 #include "chrome/test/automation/window_proxy.h" | 16 #include "chrome/test/automation/window_proxy.h" |
| 18 #include "chrome/test/testing_pref_service.h" | 17 #include "chrome/test/testing_pref_service.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion)); | 144 ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion)); |
| 146 | 145 |
| 147 bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); | 146 bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); |
| 148 ASSERT_TRUE(migrated); | 147 ASSERT_TRUE(migrated); |
| 149 ASSERT_EQ(NewTabUI::current_pref_version(), | 148 ASSERT_EQ(NewTabUI::current_pref_version(), |
| 150 prefs->GetInteger(prefs::kNTPPrefVersion)); | 149 prefs->GetInteger(prefs::kNTPPrefVersion)); |
| 151 | 150 |
| 152 migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); | 151 migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get()); |
| 153 ASSERT_FALSE(migrated); | 152 ASSERT_FALSE(migrated); |
| 154 } | 153 } |
| OLD | NEW |