OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <string> | 5 #include <string> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "content/public/browser/notification_details.h" | 31 #include "content/public/browser/notification_details.h" |
32 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
33 #include "content/test/test_browser_thread.h" | 33 #include "content/test/test_browser_thread.h" |
34 #include "testing/gmock/include/gmock/gmock.h" | 34 #include "testing/gmock/include/gmock/gmock.h" |
35 #include "testing/gtest/include/gtest/gtest.h" | 35 #include "testing/gtest/include/gtest/gtest.h" |
36 #include "webkit/glue/form_field.h" | 36 #include "webkit/glue/form_field.h" |
37 | 37 |
38 using base::Time; | 38 using base::Time; |
39 using base::TimeDelta; | 39 using base::TimeDelta; |
40 using base::WaitableEvent; | 40 using base::WaitableEvent; |
| 41 using content::BrowserThread; |
41 using testing::_; | 42 using testing::_; |
42 using testing::DoDefault; | 43 using testing::DoDefault; |
43 using testing::ElementsAreArray; | 44 using testing::ElementsAreArray; |
44 using testing::Pointee; | 45 using testing::Pointee; |
45 using testing::Property; | 46 using testing::Property; |
46 | 47 |
47 typedef std::vector<AutofillChange> AutofillChangeList; | 48 typedef std::vector<AutofillChange> AutofillChangeList; |
48 | 49 |
49 static const int kWebDataServiceTimeoutSeconds = 8; | 50 static const int kWebDataServiceTimeoutSeconds = 8; |
50 | 51 |
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 } | 698 } |
698 | 699 |
699 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { | 700 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { |
700 KeywordsConsumer consumer; | 701 KeywordsConsumer consumer; |
701 wds_->GetKeywords(&consumer); | 702 wds_->GetKeywords(&consumer); |
702 KeywordsConsumer::WaitUntilCalled(); | 703 KeywordsConsumer::WaitUntilCalled(); |
703 ASSERT_TRUE(consumer.load_succeeded); | 704 ASSERT_TRUE(consumer.load_succeeded); |
704 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); | 705 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); |
705 EXPECT_EQ(0, consumer.keywords_result.default_search_provider_id_backup); | 706 EXPECT_EQ(0, consumer.keywords_result.default_search_provider_id_backup); |
706 } | 707 } |
OLD | NEW |