| 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 25 matching lines...) Expand all Loading... |
| 36 // to the main thread. Had we tried to Signal an event in such a task | 36 // to the main thread. Had we tried to Signal an event in such a task |
| 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 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 void DoneRunOnMainThread() override { base::MessageLoop::current()->Quit(); } |
| 52 base::MessageLoop::current()->Quit(); | |
| 53 } | |
| 54 | 52 |
| 55 private: | 53 private: |
| 56 virtual ~WaitForHistoryTask() {} | 54 ~WaitForHistoryTask() override {} |
| 57 | 55 |
| 58 DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask); | 56 DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask); |
| 59 }; | 57 }; |
| 60 | 58 |
| 61 } // namespace | 59 } // namespace |
| 62 | 60 |
| 63 class HistoryBrowserTest : public InProcessBrowserTest { | 61 class HistoryBrowserTest : public InProcessBrowserTest { |
| 64 protected: | 62 protected: |
| 65 virtual void SetUpCommandLine(CommandLine* command_line) override { | 63 void SetUpCommandLine(CommandLine* command_line) override { |
| 66 command_line->AppendSwitch(switches::kEnableFileCookies); | 64 command_line->AppendSwitch(switches::kEnableFileCookies); |
| 67 } | 65 } |
| 68 | 66 |
| 69 PrefService* GetPrefs() { | 67 PrefService* GetPrefs() { |
| 70 return GetProfile()->GetPrefs(); | 68 return GetProfile()->GetPrefs(); |
| 71 } | 69 } |
| 72 | 70 |
| 73 Profile* GetProfile() { | 71 Profile* GetProfile() { |
| 74 return browser()->profile(); | 72 return browser()->profile(); |
| 75 } | 73 } |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 | 500 |
| 503 content::WebContents* active_web_contents = | 501 content::WebContents* active_web_contents = |
| 504 browser()->tab_strip_model()->GetActiveWebContents(); | 502 browser()->tab_strip_model()->GetActiveWebContents(); |
| 505 ASSERT_EQ(web_contents, active_web_contents); | 503 ASSERT_EQ(web_contents, active_web_contents); |
| 506 ASSERT_EQ(history_url, active_web_contents->GetURL()); | 504 ASSERT_EQ(history_url, active_web_contents->GetURL()); |
| 507 | 505 |
| 508 content::WebContents* second_tab = | 506 content::WebContents* second_tab = |
| 509 browser()->tab_strip_model()->GetWebContentsAt(1); | 507 browser()->tab_strip_model()->GetWebContentsAt(1); |
| 510 ASSERT_NE(history_url, second_tab->GetURL()); | 508 ASSERT_NE(history_url, second_tab->GetURL()); |
| 511 } | 509 } |
| OLD | NEW |