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/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 // and Wait for it on the main thread, the task would not run at all because | 37 // and Wait for it on the main thread, the task would not run at all because |
38 // the main thread would be blocked on the Wait call, resulting in a deadlock. | 38 // the main thread would be blocked on the Wait call, resulting in a deadlock. |
39 | 39 |
40 // A task to be scheduled on the history backend thread. | 40 // A task to be scheduled on the history backend thread. |
41 // Notifies the main thread after all history backend thread tasks have run. | 41 // Notifies the main thread after all history backend thread tasks have run. |
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 base::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 |
63 class HistoryBrowserTest : public InProcessBrowserTest { | 63 class HistoryBrowserTest : public InProcessBrowserTest { |
64 protected: | 64 protected: |
65 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 65 virtual void SetUpCommandLine(CommandLine* command_line) override { |
66 command_line->AppendSwitch(switches::kEnableFileCookies); | 66 command_line->AppendSwitch(switches::kEnableFileCookies); |
67 } | 67 } |
68 | 68 |
69 PrefService* GetPrefs() { | 69 PrefService* GetPrefs() { |
70 return GetProfile()->GetPrefs(); | 70 return GetProfile()->GetPrefs(); |
71 } | 71 } |
72 | 72 |
73 Profile* GetProfile() { | 73 Profile* GetProfile() { |
74 return browser()->profile(); | 74 return browser()->profile(); |
75 } | 75 } |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 | 502 |
503 content::WebContents* active_web_contents = | 503 content::WebContents* active_web_contents = |
504 browser()->tab_strip_model()->GetActiveWebContents(); | 504 browser()->tab_strip_model()->GetActiveWebContents(); |
505 ASSERT_EQ(web_contents, active_web_contents); | 505 ASSERT_EQ(web_contents, active_web_contents); |
506 ASSERT_EQ(history_url, active_web_contents->GetURL()); | 506 ASSERT_EQ(history_url, active_web_contents->GetURL()); |
507 | 507 |
508 content::WebContents* second_tab = | 508 content::WebContents* second_tab = |
509 browser()->tab_strip_model()->GetWebContentsAt(1); | 509 browser()->tab_strip_model()->GetWebContentsAt(1); |
510 ASSERT_NE(history_url, second_tab->GetURL()); | 510 ASSERT_NE(history_url, second_tab->GetURL()); |
511 } | 511 } |
OLD | NEW |