| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 private: | 53 private: |
| 54 ~WaitForHistoryTask() override {} | 54 ~WaitForHistoryTask() override {} |
| 55 | 55 |
| 56 DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask); | 56 DISALLOW_COPY_AND_ASSIGN(WaitForHistoryTask); |
| 57 }; | 57 }; |
| 58 | 58 |
| 59 } // namespace | 59 } // namespace |
| 60 | 60 |
| 61 class HistoryBrowserTest : public InProcessBrowserTest { | 61 class HistoryBrowserTest : public InProcessBrowserTest { |
| 62 protected: | 62 protected: |
| 63 void SetUpCommandLine(CommandLine* command_line) override { | 63 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 64 command_line->AppendSwitch(switches::kEnableFileCookies); | 64 command_line->AppendSwitch(switches::kEnableFileCookies); |
| 65 } | 65 } |
| 66 | 66 |
| 67 PrefService* GetPrefs() { | 67 PrefService* GetPrefs() { |
| 68 return GetProfile()->GetPrefs(); | 68 return GetProfile()->GetPrefs(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 Profile* GetProfile() { | 71 Profile* GetProfile() { |
| 72 return browser()->profile(); | 72 return browser()->profile(); |
| 73 } | 73 } |
| (...skipping 426 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 |