| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
|
| index 828d54879211eba4e25c7438e1a0612fc792ae48..481363c3d3959c3469a7a1ae3739ba5ff7bec78f 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_unittest.cc
|
| @@ -33,6 +33,7 @@
|
| #include "ui/base/models/menu_model.h"
|
|
|
| using extensions::Extension;
|
| +using extensions::Manifest;
|
|
|
| namespace {
|
| const int kExpectedAppIndex = 1;
|
| @@ -60,22 +61,22 @@ class ChromeLauncherControllerPerAppTest : public BrowserWithTestWindowTest {
|
| CommandLine::ForCurrentProcess(), FilePath(), false);
|
|
|
| std::string error;
|
| - extension1_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
|
| + extension1_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
|
| Extension::NO_FLAGS,
|
| "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
|
| &error);
|
| - extension2_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
|
| + extension2_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
|
| Extension::NO_FLAGS,
|
| "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
|
| &error);
|
| // Fake gmail extension.
|
| - extension3_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
|
| + extension3_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
|
| Extension::NO_FLAGS,
|
| gmail_app_id,
|
| &error);
|
|
|
| // Fake search extension.
|
| - extension4_ = Extension::Create(FilePath(), Extension::LOAD, manifest,
|
| + extension4_ = Extension::Create(FilePath(), Manifest::LOAD, manifest,
|
| Extension::NO_FLAGS,
|
| "coobgpohoikkiipiblmjeljniedjpjpf",
|
| &error);
|
|
|