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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 class WaitForHistoryTask : public history::HistoryDBTask { | 42 class WaitForHistoryTask : public history::HistoryDBTask { |
43 public: | 43 public: |
44 WaitForHistoryTask() {} | 44 WaitForHistoryTask() {} |
45 | 45 |
46 virtual bool RunOnDBThread(history::HistoryBackend* backend, | 46 virtual bool RunOnDBThread(history::HistoryBackend* backend, |
47 history::HistoryDatabase* db) OVERRIDE { | 47 history::HistoryDatabase* db) OVERRIDE { |
48 return true; | 48 return true; |
49 } | 49 } |
50 | 50 |
51 virtual void DoneRunOnMainThread() OVERRIDE { | 51 virtual void DoneRunOnMainThread() OVERRIDE { |
52 MessageLoop::current()->Quit(); | 52 base::MessageLoop::current()->Quit(); |
53 } | 53 } |
54 | 54 |
55 private: | 55 private: |
56 virtual ~WaitForHistoryTask() {} | 56 virtual ~WaitForHistoryTask() {} |
57 | 57 |
58 DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask); | 58 DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask); |
59 }; | 59 }; |
60 | 60 |
61 } // namespace | 61 } // namespace |
62 | 62 |
(...skipping 437 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 |