| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // End-to-end SDCH tests. Uses the embedded test server to return SDCH | 5 // End-to-end SDCH tests. Uses the embedded test server to return SDCH |
| 6 // results | 6 // results |
| 7 | 7 |
| 8 #include "base/base64.h" | 8 #include "base/base64.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 | 434 |
| 435 second_browser_ = new Browser(Browser::CreateParams( | 435 second_browser_ = new Browser(Browser::CreateParams( |
| 436 second_profile_, browser()->host_desktop_type())); | 436 second_profile_, browser()->host_desktop_type())); |
| 437 if (!second_browser_) return false; | 437 if (!second_browser_) return false; |
| 438 | 438 |
| 439 chrome::AddSelectedTabWithURL(second_browser_, | 439 chrome::AddSelectedTabWithURL(second_browser_, |
| 440 GURL(url::kAboutBlankURL), | 440 GURL(url::kAboutBlankURL), |
| 441 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); | 441 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); |
| 442 content::WaitForLoadStop( | 442 content::WaitForLoadStop( |
| 443 second_browser_->tab_strip_model()->GetActiveWebContents()); | 443 second_browser_->tab_strip_model()->GetActiveWebContents()); |
| 444 second_browser_->window()->Show(); | 444 second_browser_->window()->Show(false /* user_gesture */); |
| 445 | 445 |
| 446 content::BrowserThread::PostTask( | 446 content::BrowserThread::PostTask( |
| 447 content::BrowserThread::IO, | 447 content::BrowserThread::IO, |
| 448 FROM_HERE, | 448 FROM_HERE, |
| 449 base::Bind(&SdchBrowserTest::SubscribeToSdchNotifications, | 449 base::Bind(&SdchBrowserTest::SubscribeToSdchNotifications, |
| 450 base::Unretained(this), | 450 base::Unretained(this), |
| 451 make_scoped_refptr( | 451 make_scoped_refptr( |
| 452 second_browser_->profile()->GetRequestContext()))); | 452 second_browser_->profile()->GetRequestContext()))); |
| 453 | 453 |
| 454 return true; | 454 return true; |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 707 ASSERT_TRUE(SetupIncognitoBrowser()); | 707 ASSERT_TRUE(SetupIncognitoBrowser()); |
| 708 ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser())); | 708 ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser())); |
| 709 | 709 |
| 710 // Data fetches on main browser should not be SDCH encoded. | 710 // Data fetches on main browser should not be SDCH encoded. |
| 711 bool sdch_encoding_used = true; | 711 bool sdch_encoding_used = true; |
| 712 ASSERT_TRUE(GetData(&sdch_encoding_used)); | 712 ASSERT_TRUE(GetData(&sdch_encoding_used)); |
| 713 EXPECT_FALSE(sdch_encoding_used); | 713 EXPECT_FALSE(sdch_encoding_used); |
| 714 } | 714 } |
| 715 | 715 |
| 716 } // namespace | 716 } // namespace |
| OLD | NEW |