Use ExtensionRegistryObserver instead of DEPRECATED extension notify from app_window_geometry_cache

apps/app_window_geometry_cache_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/app_window_geometry_cache.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/mock_pref_change_callback.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/common/extension_builder.h"
+#include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-const char kWindowId[] = "windowid";
-const char kWindowId2[] = "windowid2";
-
 using content::BrowserThread;
 
 namespace apps {
 
+namespace {
+const char kWindowId[] = "windowid";
+const char kWindowId2[] = "windowid2";
+
+// Create a very simple extension with id.
+scoped_refptr<extensions::Extension> CreateExtension(const std::string& id) {
+  return extensions::ExtensionBuilder()
+      .SetManifest(extensions::DictionaryBuilder().Set("name", "test").Set(
+          "version", "0.1"))
+      .SetID(id)
+      .Build();
+}
+
+}  // namespace
+
 // Base class for tests.
 class AppWindowGeometryCacheTest : public testing::Test {
  public:
   AppWindowGeometryCacheTest()
-      : ui_thread_(BrowserThread::UI, &ui_message_loop_) {
+      : profile_(new TestingProfile),
+        ui_thread_(BrowserThread::UI, &ui_message_loop_) {
     prefs_.reset(new extensions::TestExtensionPrefs(
         ui_message_loop_.message_loop_proxy().get()));
-    cache_.reset(new AppWindowGeometryCache(&profile_, prefs_->prefs()));
+    cache_.reset(new AppWindowGeometryCache(profile_.get(), prefs_->prefs()));
     cache_->SetSyncDelayForTests(0);
   }
 
   void AddGeometryAndLoadExtension(const std::string& extension_id,
                                    const std::string& window_id,
                                    const gfx::Rect& bounds,
                                    const gfx::Rect& screen_bounds,
                                    ui::WindowShowState state);
 
   // Spins the UI threads' message loops to make sure any task
   // posted to sync the geometry to the value store gets a chance to run.
   void WaitForSync();
 
   void LoadExtension(const std::string& extension_id);
   void UnloadExtension(const std::string& extension_id);
 
  protected:
-  TestingProfile profile_;
+  scoped_ptr<TestingProfile> profile_;
   base::MessageLoopForUI ui_message_loop_;
   content::TestBrowserThread ui_thread_;
   scoped_ptr<extensions::TestExtensionPrefs> prefs_;
   scoped_ptr<AppWindowGeometryCache> cache_;
 };
 
 void AppWindowGeometryCacheTest::AddGeometryAndLoadExtension(
     const std::string& extension_id,
     const std::string& window_id,
     const gfx::Rect& bounds,
@@ skipping 20 matching lines @@
 }
 
 void AppWindowGeometryCacheTest::LoadExtension(
     const std::string& extension_id) {
   cache_->LoadGeometryFromStorage(extension_id);
   WaitForSync();
 }
 
 void AppWindowGeometryCacheTest::UnloadExtension(
     const std::string& extension_id) {
-  cache_->OnExtensionUnloaded(extension_id);
+  scoped_refptr<extensions::Extension> extension =
+      CreateExtension(extension_id);
+  cache_->OnExtensionUnloaded(
+      profile_.get(),
+      extension.get(),
+      extensions::UnloadedExtensionInfo::REASON_DISABLE);
   WaitForSync();
 }
 
 // Test getting geometry from an empty store.
 TEST_F(AppWindowGeometryCacheTest, GetGeometryEmptyStore) {
   const std::string extension_id = prefs_->AddExtensionAndReturnId("ext1");
   ASSERT_FALSE(cache_->GetGeometry(extension_id, kWindowId, NULL, NULL, NULL));
 }
 
 // Test getting geometry for an unknown extension.
@@ skipping 236 matching lines @@
   // The first added window should no longer have cached geometry.
   EXPECT_FALSE(cache_->GetGeometry(extension_id, "window_0", NULL, 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));
   }
 }
 
 }  // namespace apps