Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Side by Side Diff: content/browser/in_process_webkit/dom_storage_uitest.cc

Issue 9726022: Revert 127573 - DOMStorageContextImpl that's implemented in terms of the new dom_storage classes. A… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "chrome/test/automation/tab_proxy.h" 8 #include "chrome/test/automation/tab_proxy.h"
9 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
10 #include "chrome/test/ui/ui_layout_test.h" 10 #include "chrome/test/ui/ui_layout_test.h"
11 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 #include "net/base/net_util.h" 12 #include "net/base/net_util.h"
13 #include "webkit/dom_storage/dom_storage_types.h"
14
15 #ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
16 // No longer applicable.
17 #else
18 13
19 static const char* kRootFiles[] = { 14 static const char* kRootFiles[] = {
20 "clear.html", 15 "clear.html",
21 // "complex-keys.html", // Output too big for a cookie. crbug.com/33472 16 // "complex-keys.html", // Output too big for a cookie. crbug.com/33472
22 // "complex-values.html", // crbug.com/33472 17 // "complex-values.html", // crbug.com/33472
23 "quota.html", 18 "quota.html",
24 "remove-item.html", 19 "remove-item.html",
25 "window-attributes-exist.html", 20 "window-attributes-exist.html",
26 NULL 21 NULL
27 }; 22 };
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 NavigateToURL(GURL("javascript:set()")); 203 NavigateToURL(GURL("javascript:set()"));
209 QuitBrowser(); 204 QuitBrowser();
210 EXPECT_FALSE(StorageDirIsEmpty()); 205 EXPECT_FALSE(StorageDirIsEmpty());
211 206
212 LaunchBrowserAndServer(); 207 LaunchBrowserAndServer();
213 NavigateToURL(TestUrl()); 208 NavigateToURL(TestUrl());
214 NavigateToURL(GURL("javascript:clear()")); 209 NavigateToURL(GURL("javascript:clear()"));
215 QuitBrowser(); 210 QuitBrowser();
216 EXPECT_TRUE(StorageDirIsEmpty()); 211 EXPECT_TRUE(StorageDirIsEmpty());
217 } 212 }
218
219 #endif // ENABLE_NEW_DOM_STORAGE_BACKEND
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698