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

Side by Side Diff: chrome/browser/webdata/web_data_service_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 <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 13 matching lines...) Expand all
24 #include "chrome/browser/webdata/autofill_entry.h" 24 #include "chrome/browser/webdata/autofill_entry.h"
25 #include "chrome/browser/webdata/web_data_service.h" 25 #include "chrome/browser/webdata/web_data_service.h"
26 #include "chrome/browser/webdata/web_data_service_test_util.h" 26 #include "chrome/browser/webdata/web_data_service_test_util.h"
27 #include "chrome/browser/webdata/web_intents_table.h" 27 #include "chrome/browser/webdata/web_intents_table.h"
28 #include "chrome/common/chrome_notification_types.h" 28 #include "chrome/common/chrome_notification_types.h"
29 #include "chrome/common/chrome_paths.h" 29 #include "chrome/common/chrome_paths.h"
30 #include "chrome/common/guid.h" 30 #include "chrome/common/guid.h"
31 #include "chrome/test/base/thread_observer_helper.h" 31 #include "chrome/test/base/thread_observer_helper.h"
32 #include "content/public/browser/notification_details.h" 32 #include "content/public/browser/notification_details.h"
33 #include "content/public/browser/notification_service.h" 33 #include "content/public/browser/notification_service.h"
34 #include "content/test/test_browser_thread.h" 34 #include "content/public/test/test_browser_thread.h"
35 #include "testing/gmock/include/gmock/gmock.h" 35 #include "testing/gmock/include/gmock/gmock.h"
36 #include "testing/gtest/include/gtest/gtest.h" 36 #include "testing/gtest/include/gtest/gtest.h"
37 #include "webkit/forms/form_field.h" 37 #include "webkit/forms/form_field.h"
38 38
39 using base::Time; 39 using base::Time;
40 using base::TimeDelta; 40 using base::TimeDelta;
41 using base::WaitableEvent; 41 using base::WaitableEvent;
42 using content::BrowserThread; 42 using content::BrowserThread;
43 using testing::_; 43 using testing::_;
44 using testing::DoDefault; 44 using testing::DoDefault;
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 } 794 }
795 795
796 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { 796 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) {
797 KeywordsConsumer consumer; 797 KeywordsConsumer consumer;
798 wds_->GetKeywords(&consumer); 798 wds_->GetKeywords(&consumer);
799 WaitUntilCalled(); 799 WaitUntilCalled();
800 ASSERT_TRUE(consumer.load_succeeded); 800 ASSERT_TRUE(consumer.load_succeeded);
801 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); 801 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change);
802 EXPECT_FALSE(consumer.keywords_result.backup_valid); 802 EXPECT_FALSE(consumer.keywords_result.backup_valid);
803 } 803 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698