| Index: extensions/browser/app_window/app_window_geometry_cache_unittest.cc
|
| diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
|
| index 144bd158256237da7c986cc906bdf90bcef98ad6..eaddb005b8dd4084cd9a59b3f7ec9b546ed5a3b2 100644
|
| --- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
|
| +++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc
|
| @@ -178,7 +178,8 @@ std::string AppWindowGeometryCacheTest::AddExtensionWithPrefs(
|
| // Test getting geometry from an empty store.
|
| TEST_F(AppWindowGeometryCacheTest, GetGeometryEmptyStore) {
|
| const std::string extension_id = AddExtensionWithPrefs("ext1");
|
| - ASSERT_FALSE(cache_->GetGeometry(extension_id, kWindowId, NULL, NULL, NULL));
|
| + ASSERT_FALSE(
|
| + cache_->GetGeometry(extension_id, kWindowId, nullptr, NULL, NULL));
|
| }
|
|
|
| // Test getting geometry for an unknown extension.
|
| @@ -190,7 +191,8 @@ TEST_F(AppWindowGeometryCacheTest, GetGeometryUnkownExtension) {
|
| gfx::Rect(4, 5, 31, 43),
|
| gfx::Rect(0, 0, 1600, 900),
|
| ui::SHOW_STATE_NORMAL);
|
| - ASSERT_FALSE(cache_->GetGeometry(extension_id2, kWindowId, NULL, NULL, NULL));
|
| + ASSERT_FALSE(
|
| + cache_->GetGeometry(extension_id2, kWindowId, nullptr, NULL, NULL));
|
| }
|
|
|
| // Test getting geometry for an unknown window in a known extension.
|
| @@ -201,7 +203,8 @@ TEST_F(AppWindowGeometryCacheTest, GetGeometryUnkownWindow) {
|
| gfx::Rect(4, 5, 31, 43),
|
| gfx::Rect(0, 0, 1600, 900),
|
| ui::SHOW_STATE_NORMAL);
|
| - ASSERT_FALSE(cache_->GetGeometry(extension_id, kWindowId2, NULL, NULL, NULL));
|
| + ASSERT_FALSE(
|
| + cache_->GetGeometry(extension_id, kWindowId2, nullptr, NULL, NULL));
|
| }
|
|
|
| // Test that loading geometry, screen_bounds and state from the store works
|
| @@ -419,11 +422,13 @@ TEST_F(AppWindowGeometryCacheTest, MaxWindows) {
|
| }
|
|
|
| // The first added window should no longer have cached geometry.
|
| - EXPECT_FALSE(cache_->GetGeometry(extension_id, "window_0", NULL, NULL, NULL));
|
| + EXPECT_FALSE(
|
| + cache_->GetGeometry(extension_id, "window_0", nullptr, NULL, NULL));
|
| // All other windows should still exist.
|
| for (size_t i = 1; i < AppWindowGeometryCache::kMaxCachedWindows + 1; ++i) {
|
| std::string window_id = "window_" + base::IntToString(i);
|
| - EXPECT_TRUE(cache_->GetGeometry(extension_id, window_id, NULL, NULL, NULL));
|
| + EXPECT_TRUE(
|
| + cache_->GetGeometry(extension_id, window_id, nullptr, NULL, NULL));
|
| }
|
| }
|
|
|
|
|