Use ApiUnitTest for storage API tests (storage_api_unittest and storage_frontend_unittest).

extensions/browser/api/storage/storage_api_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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/extensions/extension_api_unittest.h"
-#include "chrome/browser/extensions/test_extension_system.h"
+#include "content/public/test/test_browser_context.h"
+#include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/storage/leveldb_settings_storage_factory.h"
 #include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
 #include "extensions/browser/api/storage/settings_test_util.h"
 #include "extensions/browser/api/storage/storage_api.h"
 #include "extensions/browser/api/storage/storage_frontend.h"
+#include "extensions/browser/api_unittest.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/mock_extension_system.h"
+#include "extensions/browser/test_extensions_browser_client.h"
 #include "extensions/browser/value_store/leveldb_value_store.h"
 #include "extensions/browser/value_store/value_store.h"
 #include "extensions/common/id_util.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/test_util.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
 namespace extensions {
 
 namespace {
 
 // Caller owns the returned object.
 KeyedService* CreateStorageFrontendForTesting(
     content::BrowserContext* context) {
   return StorageFrontend::CreateForTesting(new LeveldbSettingsStorageFactory(),
                                            context);
 }
 
 }  // namespace
 
-class StorageApiUnittest : public ExtensionApiUnittest {
+class StorageApiUnittest : public ApiUnitTest {
  public:
+  StorageApiUnittest() {}
+
   virtual void SetUp() OVERRIDE {
-    ExtensionApiUnittest::SetUp();
-    TestExtensionSystem* extension_system =
-        static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile()));
-    // StorageFrontend requires an EventRouter.
-    extension_system->SetEventRouter(scoped_ptr<EventRouter>(
-        new EventRouter(profile(), ExtensionPrefs::Get(profile()))));
+    ApiUnitTest::SetUp();
+    extensions_browser_client()->set_extension_system_factory(
+        &extension_system_factory_);
   }
 
  protected:
   // Runs the storage.set() API function with local storage.
   void RunSetFunction(const std::string& key, const std::string& value) {
     RunFunction(
         new StorageStorageAreaSetFunction(),
         base::StringPrintf(
             "[\"local\", {\"%s\": \"%s\"}]", key.c_str(), value.c_str()));
   }
 
   // Runs the storage.get() API function with the local storage, and populates
   // |value| with the string result.
   testing::AssertionResult RunGetFunction(const std::string& key,
                                           std::string* value) {
     scoped_ptr<base::Value> result = RunFunctionAndReturnValue(
         new StorageStorageAreaGetFunction(),
         base::StringPrintf("[\"local\", \"%s\"]", key.c_str()));
     if (!result.get())
       return testing::AssertionFailure() << "No result";
     base::DictionaryValue* dict = NULL;
     if (!result->GetAsDictionary(&dict))
       return testing::AssertionFailure() << result << " was not a dictionary.";
     if (!dict->GetString(key, value)) {
       return testing::AssertionFailure() << " could not retrieve a string from"
           << dict << " at " << key;
     }
     return testing::AssertionSuccess();
   }
+
+  MockExtensionSystemFactory<
+      settings_test_util::MockExtensionSystemWithEventRouter>
+      extension_system_factory_;
+  ExtensionsAPIClient extensions_api_client_;
 };
 
 TEST_F(StorageApiUnittest, RestoreCorruptedStorage) {
   // Ensure a StorageFrontend can be created on demand. The StorageFrontend
   // will be owned by the KeyedService system.
   StorageFrontend::GetFactoryInstance()->SetTestingFactory(
-      profile(), &CreateStorageFrontendForTesting);
+      browser_context(), &CreateStorageFrontendForTesting);
 
   const char kKey[] = "key";
   const char kValue[] = "value";
   std::string result;
 
   // Do a simple set/get combo to make sure the API works.
   RunSetFunction(kKey, kValue);
   EXPECT_TRUE(RunGetFunction(kKey, &result));
   EXPECT_EQ(kValue, result);
 
   // Corrupt the store. This is not as pretty as ideal, because we use knowledge
   // of the underlying structure, but there's no real good way to corrupt a
   // store other than directly modifying the files.
   ValueStore* store =
       settings_test_util::GetStorage(extension_ref(),
                                      settings_namespace::LOCAL,
-                                     StorageFrontend::Get(profile()));
+                                     StorageFrontend::Get(browser_context()));
   ASSERT_TRUE(store);
   SettingsStorageQuotaEnforcer* quota_store =
       static_cast<SettingsStorageQuotaEnforcer*>(store);
   LeveldbValueStore* leveldb_store =
       static_cast<LeveldbValueStore*>(quota_store->get_delegate_for_test());
   leveldb::WriteBatch batch;
   batch.Put(kKey, "[{(.*+\"\'\\");
   EXPECT_TRUE(leveldb_store->WriteToDbForTest(&batch));
   EXPECT_TRUE(leveldb_store->Get(kKey)->IsCorrupted());
 
   // Running another set should end up working (even though it will restore the
   // store behind the scenes).
   RunSetFunction(kKey, kValue);
   EXPECT_TRUE(RunGetFunction(kKey, &result));
   EXPECT_EQ(kValue, result);
 }
 
 }  // namespace extensions