| 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 #include "base/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
| 8 #include "chrome/browser/extensions/extension_icon_manager.h" | 8 #include "chrome/browser/extensions/extension_icon_manager.h" |
| 9 #include "chrome/browser/extensions/extension_install_prompt.h" | 9 #include "chrome/browser/extensions/extension_install_prompt.h" |
| 10 #include "chrome/browser/extensions/extension_install_prompt_experiment.h" | 10 #include "chrome/browser/extensions/extension_install_prompt_experiment.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 web_contents_(NULL) {} | 97 web_contents_(NULL) {} |
| 98 | 98 |
| 99 void ScrollbarTest::SetUpOnMainThread() { | 99 void ScrollbarTest::SetUpOnMainThread() { |
| 100 ExtensionBrowserTest::SetUpOnMainThread(); | 100 ExtensionBrowserTest::SetUpOnMainThread(); |
| 101 extension_ = ExtensionBrowserTest::LoadExtension(test_data_dir_.AppendASCII( | 101 extension_ = ExtensionBrowserTest::LoadExtension(test_data_dir_.AppendASCII( |
| 102 "install_prompt/permissions_scrollbar_regression")); | 102 "install_prompt/permissions_scrollbar_regression")); |
| 103 | 103 |
| 104 web_contents_ = browser()->tab_strip_model()->GetWebContentsAt(0); | 104 web_contents_ = browser()->tab_strip_model()->GetWebContentsAt(0); |
| 105 | 105 |
| 106 install_prompt_ = new MockExtensionInstallPrompt(web_contents_); | 106 install_prompt_ = new MockExtensionInstallPrompt(web_contents_); |
| 107 install_prompt_->set_prompt(prompt_); | 107 install_prompt_->set_prompt(prompt_.get()); |
| 108 prompt_->set_experiment(ExtensionInstallPromptExperiment::ControlGroup()); | 108 prompt_->set_experiment(ExtensionInstallPromptExperiment::ControlGroup()); |
| 109 prompt_->set_extension(extension_); | 109 prompt_->set_extension(extension_); |
| 110 | 110 |
| 111 scoped_ptr<ExtensionIconManager> icon_manager(new ExtensionIconManager()); | 111 scoped_ptr<ExtensionIconManager> icon_manager(new ExtensionIconManager()); |
| 112 const SkBitmap icon_bitmap = icon_manager->GetIcon(extension_->id()); | 112 const SkBitmap icon_bitmap = icon_manager->GetIcon(extension_->id()); |
| 113 gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap); | 113 gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap); |
| 114 prompt_->set_icon(icon); | 114 prompt_->set_icon(icon); |
| 115 | 115 |
| 116 this->SetPromptPermissions(std::vector<base::string16>()); | 116 this->SetPromptPermissions(std::vector<base::string16>()); |
| 117 this->SetPromptDetails(std::vector<base::string16>()); | 117 this->SetPromptDetails(std::vector<base::string16>()); |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 base::string16 permission_string(base::ASCIIToUTF16( | 171 base::string16 permission_string(base::ASCIIToUTF16( |
| 172 "Read and modify your data on *.facebook.com")); | 172 "Read and modify your data on *.facebook.com")); |
| 173 std::vector<base::string16> permissions; | 173 std::vector<base::string16> permissions; |
| 174 permissions.push_back(permission_string); | 174 permissions.push_back(permission_string); |
| 175 this->SetPromptPermissions(permissions); | 175 this->SetPromptPermissions(permissions); |
| 176 std::vector<base::string16> details; | 176 std::vector<base::string16> details; |
| 177 details.push_back(base::string16()); | 177 details.push_back(base::string16()); |
| 178 this->SetPromptDetails(details); | 178 this->SetPromptDetails(details); |
| 179 ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible"; | 179 ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible"; |
| 180 } | 180 } |
| OLD | NEW |