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 <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 #include <utility> | 10 #include <utility> |
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
431 base::FilePath user_data_dir; | 431 base::FilePath user_data_dir; |
432 PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); | 432 PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); |
433 | 433 |
434 if (!second_profile_data_dir_.CreateUniqueTempDirUnderPath(user_data_dir)) | 434 if (!second_profile_data_dir_.CreateUniqueTempDirUnderPath(user_data_dir)) |
435 return false; | 435 return false; |
436 | 436 |
437 second_profile_ = g_browser_process->profile_manager()->GetProfile( | 437 second_profile_ = g_browser_process->profile_manager()->GetProfile( |
438 second_profile_data_dir_.path()); | 438 second_profile_data_dir_.path()); |
439 if (!second_profile_) return false; | 439 if (!second_profile_) return false; |
440 | 440 |
441 second_browser_ = new Browser(Browser::CreateParams( | 441 second_browser_ = new Browser(Browser::CreateParams(second_profile_)); |
442 second_profile_, browser()->host_desktop_type())); | |
443 if (!second_browser_) return false; | 442 if (!second_browser_) return false; |
444 | 443 |
445 chrome::AddSelectedTabWithURL(second_browser_, | 444 chrome::AddSelectedTabWithURL(second_browser_, |
446 GURL(url::kAboutBlankURL), | 445 GURL(url::kAboutBlankURL), |
447 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); | 446 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); |
448 content::WaitForLoadStop( | 447 content::WaitForLoadStop( |
449 second_browser_->tab_strip_model()->GetActiveWebContents()); | 448 second_browser_->tab_strip_model()->GetActiveWebContents()); |
450 second_browser_->window()->Show(); | 449 second_browser_->window()->Show(); |
451 | 450 |
452 content::BrowserThread::PostTask( | 451 content::BrowserThread::PostTask( |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
713 ASSERT_TRUE(SetupIncognitoBrowser()); | 712 ASSERT_TRUE(SetupIncognitoBrowser()); |
714 ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser())); | 713 ASSERT_TRUE(ForceSdchDictionaryLoad(incognito_browser())); |
715 | 714 |
716 // Data fetches on main browser should not be SDCH encoded. | 715 // Data fetches on main browser should not be SDCH encoded. |
717 bool sdch_encoding_used = true; | 716 bool sdch_encoding_used = true; |
718 ASSERT_TRUE(GetData(&sdch_encoding_used)); | 717 ASSERT_TRUE(GetData(&sdch_encoding_used)); |
719 EXPECT_FALSE(sdch_encoding_used); | 718 EXPECT_FALSE(sdch_encoding_used); |
720 } | 719 } |
721 | 720 |
722 } // namespace | 721 } // namespace |
OLD | NEW |