Resubmit: Add a Restore() method to ValueStore and make StorageAPI use it

chrome/browser/extensions/test_extension_system.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/test_extension_system.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
@@ skipping 134 matching lines @@
   return state_store_.get();
 }
 
 InfoMap* TestExtensionSystem::info_map() { return info_map_.get(); }
 
 LazyBackgroundTaskQueue*
 TestExtensionSystem::lazy_background_task_queue() {
   return NULL;
 }
 
-EventRouter* TestExtensionSystem::event_router() {
-  return NULL;
+void TestExtensionSystem::SetEventRouter(scoped_ptr<EventRouter> event_router) {
+  event_router_.reset(event_router.release());
 }
 
+EventRouter* TestExtensionSystem::event_router() { return event_router_.get(); }
+
 ExtensionWarningService* TestExtensionSystem::warning_service() {
   return NULL;
 }
 
 Blacklist* TestExtensionSystem::blacklist() {
   return blacklist_.get();
 }
 
 ErrorConsole* TestExtensionSystem::error_console() {
   return error_console_.get();
@@ skipping 11 matching lines @@
   return ready_;
 }
 
 // static
 BrowserContextKeyedService* TestExtensionSystem::Build(
     content::BrowserContext* profile) {
   return new TestExtensionSystem(static_cast<Profile*>(profile));
 }
 
 }  // namespace extensions