| 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/metrics/histogram.h" | 6 #include "base/metrics/histogram.h" |
| 7 #include "base/metrics/statistics_recorder.h" |
| 7 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 8 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/protector/base_setting_change.h" | 10 #include "chrome/browser/protector/base_setting_change.h" |
| 10 #include "chrome/browser/protector/histograms.h" | 11 #include "chrome/browser/protector/histograms.h" |
| 11 #include "chrome/browser/protector/mock_protector_service.h" | 12 #include "chrome/browser/protector/mock_protector_service.h" |
| 12 #include "chrome/browser/protector/protector_service_factory.h" | 13 #include "chrome/browser/protector/protector_service_factory.h" |
| 13 #include "chrome/browser/search_engines/template_url.h" | 14 #include "chrome/browser/search_engines/template_url.h" |
| 14 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 15 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 15 #include "chrome/browser/search_engines/template_url_service.h" | 16 #include "chrome/browser/search_engines/template_url_service.h" |
| 16 #include "chrome/browser/search_engines/template_url_service_factory.h" | 17 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 EXPECT_EQ(FindTemplateURL(http_example_info), | 668 EXPECT_EQ(FindTemplateURL(http_example_info), |
| 668 turl_service_->GetDefaultSearchProvider()); | 669 turl_service_->GetDefaultSearchProvider()); |
| 669 | 670 |
| 670 // Discard does nothing - backup was already active. | 671 // Discard does nothing - backup was already active. |
| 671 change->Discard(browser()); | 672 change->Discard(browser()); |
| 672 EXPECT_EQ(FindTemplateURL(http_example_info), | 673 EXPECT_EQ(FindTemplateURL(http_example_info), |
| 673 turl_service_->GetDefaultSearchProvider()); | 674 turl_service_->GetDefaultSearchProvider()); |
| 674 } | 675 } |
| 675 | 676 |
| 676 } // namespace protector | 677 } // namespace protector |
| OLD | NEW |