Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

extensions/shell/browser/shell_browser_context.h

Index: extensions/shell/browser/shell_browser_context.h
diff --git a/extensions/shell/browser/shell_browser_context.h b/extensions/shell/browser/shell_browser_context.h
index 72f3fc5fbdd73516415812dd753bcd842854650c..f5ff8db1818beb45f0864ca358dcbb729a5d09ee 100644
--- a/extensions/shell/browser/shell_browser_context.h
+++ b/extensions/shell/browser/shell_browser_context.h
@@ -22,7 +22,7 @@ class ShellBrowserContext : public content::ShellBrowserContext {
   virtual ~ShellBrowserContext();
 
   // content::BrowserContext implementation.
-  virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
+  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
 
   // HACK: Pad the virtual function table so we trip an assertion if someone
   // tries to use |this| as a Profile.
@@ -43,7 +43,7 @@ class ShellBrowserContext : public content::ShellBrowserContext {
   virtual void ProfileFunctionCallOnNonProfileBrowserContext15();
 
  private:
-  scoped_refptr<quota::SpecialStoragePolicy> storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserContext);
 };