| Index: chrome/browser/ui/panels/base_panel_browser_test.cc
|
| diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| index c39c8b2be26eebf7329446a109ae71aa598d1275..331fc12b2e7e60808e6b7d23bb4d6df2d0d93d4b 100644
|
| --- a/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| +#include "base/json/json_file_value_serializer.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop.h"
|
| #include "base/path_service.h"
|
| @@ -424,6 +425,32 @@ scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
|
| return extension;
|
| }
|
|
|
| +scoped_refptr<extensions::Extension>
|
| +BasePanelBrowserTest::LoadExtensionFromManifest(
|
| + const FilePath::StringType& manifest_file) {
|
| + FilePath manifest_path;
|
| + PathService::Get(chrome::DIR_TEST_DATA, &manifest_path);
|
| + manifest_path = manifest_path.Append(kTestDir);
|
| + manifest_path = manifest_path.Append(manifest_file);
|
| +
|
| + JSONFileValueSerializer serializer(manifest_path);
|
| + scoped_ptr<DictionaryValue> manifest(
|
| + static_cast<DictionaryValue*>(serializer.Deserialize(NULL, NULL)));
|
| + EXPECT_TRUE(manifest.get() != NULL);
|
| +
|
| + std::string error;
|
| + scoped_refptr<extensions::Extension> extension(Extension::Create(
|
| + manifest_path.DirName(), Extension::INVALID, *manifest.get(),
|
| + Extension::NO_FLAGS, &error));
|
| + EXPECT_TRUE(extension.get());
|
| + EXPECT_STREQ("", error.c_str());
|
| + browser()->profile()->GetExtensionService()->
|
| + OnExtensionInstalled(extension.get(), false /* not from webstore */,
|
| + syncer::StringOrdinal(),
|
| + false /* no requirement errors */);
|
| + return extension;
|
| +}
|
| +
|
| void BasePanelBrowserTest::SetTestingAreas(const gfx::Rect& primary_screen_area,
|
| const gfx::Rect& work_area) {
|
| DCHECK(primary_screen_area.Contains(work_area));
|
|
|