IndexedDB: Update calls to and implementations of WebIDBFactory.

The BackingStoreType and maximumSize parameters have been removed.

Remove the --indexeddb-use-sqlite command-line flag.

BUG=none
TEST=all current tests pass (layout tests, browser tests, pyautotests)

Review URL: http://codereview.chromium.org/8202003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107547 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/in_process_webkit/indexed_db_browsertest.cc

@@ -59,21 +59,10 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
   }
 };
 
-class IndexedDBSQLiteBrowserTest : public IndexedDBBrowserTest {
- public:
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    command_line->AppendSwitch(switches::kSQLiteIndexedDatabase);
-  }
-};
-
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
   SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
 }
 
-IN_PROC_BROWSER_TEST_F(IndexedDBSQLiteBrowserTest, CursorTest) {
-  SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
-}
-
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTestIncognito) {
   SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))),
              true /* incognito */);

content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

@@ -210,21 +210,9 @@ void IndexedDBDispatcherHost::OnIDBFactoryGetDatabaseNames(
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
 
-  WebKit::WebIDBFactory::BackingStoreType backingStoreType =
-      WebKit::WebIDBFactory::LevelDBBackingStore;
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kSQLiteIndexedDatabase)) {
-    backingStoreType = WebKit::WebIDBFactory::SQLiteBackingStore;
-  }
-
-  // TODO(dgrogan): Delete this magic constant once we've removed sqlite.
-  static const uint64 kIncognitoSqliteBackendQuota = 50 * 1024 * 1024;
-
   Context()->GetIDBFactory()->getDatabaseNames(
       new IndexedDBCallbacks<WebDOMStringList>(this, params.response_id),
-      origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path),
-      kIncognitoSqliteBackendQuota, backingStoreType);
+      origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path));
 }
 
 void IndexedDBDispatcherHost::OnIDBFactoryOpen(
@@ -247,25 +235,13 @@ void IndexedDBDispatcherHost::OnIDBFactoryOpen(
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
 
-  WebKit::WebIDBFactory::BackingStoreType backingStoreType =
-      WebKit::WebIDBFactory::LevelDBBackingStore;
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kSQLiteIndexedDatabase)) {
-    backingStoreType = WebKit::WebIDBFactory::SQLiteBackingStore;
-  }
-
-  // TODO(dgrogan): Delete this magic constant once we've removed sqlite.
-  static const uint64 kIncognitoSqliteBackendQuota = 50 * 1024 * 1024;
-
   // TODO(dgrogan): Don't let a non-existing database be opened (and therefore
   // created) if this origin is already over quota.
   Context()->GetIDBFactory()->open(
       params.name,
       new IndexedDBCallbacks<WebIDBDatabase>(this, params.response_id,
                                              origin_url),
-      origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path),
-      kIncognitoSqliteBackendQuota, backingStoreType);
+      origin, NULL, webkit_glue::FilePathToWebString(indexed_db_path));
 }
 
 void IndexedDBDispatcherHost::OnIDBFactoryDeleteDatabase(

content/public/common/content_switches.cc

@@ -452,10 +452,6 @@ const char kSingleProcess[]                 = "single-process";
 // content. The switch is intended only for tests.
 const char kSkipGpuDataLoading[]            = "skip-gpu-data-loading";
 
-// Use SQLite as back-end for Indexed Database API.
-// Used for debugging differences between the LevelDB and SQLite back-end.
-const char kSQLiteIndexedDatabase[]         = "indexeddb-use-sqlite";
-
 // Runs the security test for the renderer sandbox.
 const char kTestSandbox[]                   = "test-sandbox";
 

content/public/common/content_switches.h

@@ -144,7 +144,6 @@ extern const char kShowPaintRects[];
 extern const char kSimpleDataSource[];
 CONTENT_EXPORT extern const char kSingleProcess[];
 CONTENT_EXPORT extern const char kSkipGpuDataLoading[];
-CONTENT_EXPORT extern const char kSQLiteIndexedDatabase[];
 CONTENT_EXPORT extern const char kTestSandbox[];
 extern const char kUnlimitedQuotaForFiles[];
 CONTENT_EXPORT extern const char kUserAgent[];

content/renderer/renderer_webidbfactory_impl.cc

@@ -26,9 +26,7 @@ void RendererWebIDBFactoryImpl::getDatabaseNames(
     WebIDBCallbacks* callbacks,
     const WebSecurityOrigin& origin,
     WebFrame* web_frame,
-    const WebString& data_dir_unused,
-    unsigned long long maximum_size_unused,
-    WebKit::WebIDBFactory::BackingStoreType) {
+    const WebString& data_dir_unused) {
   IndexedDBDispatcher* dispatcher =
       RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBFactoryGetDatabaseNames(
@@ -40,9 +38,7 @@ void RendererWebIDBFactoryImpl::open(
     WebIDBCallbacks* callbacks,
     const WebSecurityOrigin& origin,
     WebFrame* web_frame,
-    const WebString& data_dir,
-    unsigned long long maximum_size_unused,
-    WebKit::WebIDBFactory::BackingStoreType) {
+    const WebString& data_dir) {
   // Don't send the data_dir. We know what we want on the Browser side of
   // things.
   IndexedDBDispatcher* dispatcher =
@@ -57,17 +53,6 @@ void RendererWebIDBFactoryImpl::deleteDatabase(
     const WebSecurityOrigin& origin,
     WebFrame* web_frame,
     const WebString& data_dir) {
-  deleteDatabase(name, callbacks, origin, web_frame, data_dir,
-                 WebKit::WebIDBFactory::DefaultBackingStore);
-}
-
-void RendererWebIDBFactoryImpl::deleteDatabase(
-    const WebString& name,
-    WebIDBCallbacks* callbacks,
-    const WebSecurityOrigin& origin,
-    WebFrame* web_frame,
-    const WebString& data_dir,
-    WebKit::WebIDBFactory::BackingStoreType) {
   // Don't send the data_dir. We know what we want on the Browser side of
   // things.
   IndexedDBDispatcher* dispatcher =

content/renderer/renderer_webidbfactory_impl.h

@@ -28,22 +28,9 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
       WebKit::WebIDBCallbacks* callbacks,
       const WebKit::WebSecurityOrigin& origin,
       WebKit::WebFrame* web_frame,
-      const WebKit::WebString& data_dir,
-      // TODO(dgrogan): Remove maximum_size after it's out of the webkit api.
-      unsigned long long maximum_size,
-      WebKit::WebIDBFactory::BackingStoreType);
+      const WebKit::WebString& data_dir);
 
   virtual void open(
-      const WebKit::WebString& name,
-      WebKit::WebIDBCallbacks* callbacks,
-      const WebKit::WebSecurityOrigin& origin,
-      WebKit::WebFrame* web_frame,
-      const WebKit::WebString& data_dir,
-      // TODO(dgrogan): Remove maximum_size after it's out of the webkit api.
-      unsigned long long maximum_size,
-      WebKit::WebIDBFactory::BackingStoreType);
-  // FIXME(jochen): remove after webkit roll.
-  virtual void deleteDatabase(
       const WebKit::WebString& name,
       WebKit::WebIDBCallbacks* callbacks,
       const WebKit::WebSecurityOrigin& origin,
@@ -54,8 +41,7 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
       WebKit::WebIDBCallbacks* callbacks,
       const WebKit::WebSecurityOrigin& origin,
       WebKit::WebFrame* web_frame,
-      const WebKit::WebString& data_dir,
-      WebKit::WebIDBFactory::BackingStoreType);
+      const WebKit::WebString& data_dir);
 };
 
 #endif  // CONTENT_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_