| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "chrome/browser/extensions/extension_function_test_utils.h" | 10 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 void ManagementApiUnitTest::SetUp() { | 86 void ManagementApiUnitTest::SetUp() { |
| 87 ExtensionServiceTestBase::SetUp(); | 87 ExtensionServiceTestBase::SetUp(); |
| 88 InitializeEmptyExtensionService(); | 88 InitializeEmptyExtensionService(); |
| 89 ManagementAPI::GetFactoryInstance()->SetTestingFactory(profile(), | 89 ManagementAPI::GetFactoryInstance()->SetTestingFactory(profile(), |
| 90 &BuildManagementApi); | 90 &BuildManagementApi); |
| 91 | 91 |
| 92 EventRouterFactory::GetInstance()->SetTestingFactory(profile(), | 92 EventRouterFactory::GetInstance()->SetTestingFactory(profile(), |
| 93 &BuildEventRouter); | 93 &BuildEventRouter); |
| 94 | 94 |
| 95 browser_window_.reset(new TestBrowserWindow()); | 95 browser_window_.reset(new TestBrowserWindow()); |
| 96 Browser::CreateParams params(profile()); | 96 Browser::CreateParams params(profile(), true); |
| 97 params.type = Browser::TYPE_TABBED; | 97 params.type = Browser::TYPE_TABBED; |
| 98 params.window = browser_window_.get(); | 98 params.window = browser_window_.get(); |
| 99 browser_.reset(new Browser(params)); | 99 browser_.reset(new Browser(params)); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void ManagementApiUnitTest::TearDown() { | 102 void ManagementApiUnitTest::TearDown() { |
| 103 browser_.reset(); | 103 browser_.reset(); |
| 104 browser_window_.reset(); | 104 browser_window_.reset(); |
| 105 ExtensionServiceTestBase::TearDown(); | 105 ExtensionServiceTestBase::TearDown(); |
| 106 } | 106 } |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 EXPECT_FALSE(prefs->DidExtensionEscalatePermissions(extension_id)); | 380 EXPECT_FALSE(prefs->DidExtensionEscalatePermissions(extension_id)); |
| 381 } | 381 } |
| 382 | 382 |
| 383 // Some permissions for v2 extension should be granted by now. | 383 // Some permissions for v2 extension should be granted by now. |
| 384 known_perms = prefs->GetGrantedPermissions(extension_id); | 384 known_perms = prefs->GetGrantedPermissions(extension_id); |
| 385 ASSERT_TRUE(known_perms); | 385 ASSERT_TRUE(known_perms); |
| 386 EXPECT_FALSE(known_perms->IsEmpty()); | 386 EXPECT_FALSE(known_perms->IsEmpty()); |
| 387 } | 387 } |
| 388 | 388 |
| 389 } // namespace extensions | 389 } // namespace extensions |
| OLD | NEW |