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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 base::FilePath(base::FilePath::kCurrentDirectory), | 84 base::FilePath(base::FilePath::kCurrentDirectory), |
85 base::FilePath(FILE_PATH_LITERAL("title2.html"))); | 85 base::FilePath(FILE_PATH_LITERAL("title2.html"))); |
86 } | 86 } |
87 | 87 |
88 void WaitForHistoryBackendToRun() { | 88 void WaitForHistoryBackendToRun() { |
89 CancelableRequestConsumerTSimple<int> request_consumer; | 89 CancelableRequestConsumerTSimple<int> request_consumer; |
90 scoped_refptr<history::HistoryDBTask> task(new WaitForHistoryTask()); | 90 scoped_refptr<history::HistoryDBTask> task(new WaitForHistoryTask()); |
91 HistoryService* history = | 91 HistoryService* history = |
92 HistoryServiceFactory::GetForProfile(GetProfile(), | 92 HistoryServiceFactory::GetForProfile(GetProfile(), |
93 Profile::EXPLICIT_ACCESS); | 93 Profile::EXPLICIT_ACCESS); |
94 history->HistoryService::ScheduleDBTask(task, &request_consumer); | 94 history->HistoryService::ScheduleDBTask(task.get(), &request_consumer); |
95 content::RunMessageLoop(); | 95 content::RunMessageLoop(); |
96 } | 96 } |
97 | 97 |
98 void ExpectEmptyHistory() { | 98 void ExpectEmptyHistory() { |
99 std::vector<GURL> urls(GetHistoryContents()); | 99 std::vector<GURL> urls(GetHistoryContents()); |
100 EXPECT_EQ(0U, urls.size()); | 100 EXPECT_EQ(0U, urls.size()); |
101 } | 101 } |
102 | 102 |
103 void LoadAndWaitForURL(const GURL& url) { | 103 void LoadAndWaitForURL(const GURL& url) { |
104 string16 expected_title(ASCIIToUTF16("OK")); | 104 string16 expected_title(ASCIIToUTF16("OK")); |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
500 | 500 |
501 content::WebContents* active_web_contents = | 501 content::WebContents* active_web_contents = |
502 browser()->tab_strip_model()->GetActiveWebContents(); | 502 browser()->tab_strip_model()->GetActiveWebContents(); |
503 ASSERT_EQ(web_contents, active_web_contents); | 503 ASSERT_EQ(web_contents, active_web_contents); |
504 ASSERT_EQ(history_url, active_web_contents->GetURL()); | 504 ASSERT_EQ(history_url, active_web_contents->GetURL()); |
505 | 505 |
506 content::WebContents* second_tab = | 506 content::WebContents* second_tab = |
507 browser()->tab_strip_model()->GetWebContentsAt(1); | 507 browser()->tab_strip_model()->GetWebContentsAt(1); |
508 ASSERT_NE(history_url, second_tab->GetURL()); | 508 ASSERT_NE(history_url, second_tab->GetURL()); |
509 } | 509 } |
OLD | NEW |