| Index: chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| diff --git a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| index 0bd63d0291683e999ad058d2c56e9ad8f67ff928..9804be7eab7b33c3f07cc133bec60062b3ccffe0 100644
|
| --- a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| +++ b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| @@ -7,47 +7,10 @@
|
| #include "base/ref_counted.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/browser.h"
|
| -#include "chrome/browser/in_process_webkit/indexed_db_context.h"
|
| #include "chrome/browser/tab_contents/tab_contents.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/test/in_process_browser_test.h"
|
| -#include "chrome/test/thread_test_helper.h"
|
| #include "chrome/test/ui_test_utils.h"
|
| -#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
|
| -#include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
|
| -#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
|
| -
|
| -namespace {
|
| -
|
| -const FilePath kTestIndexedDBFile(
|
| - FILE_PATH_LITERAL("http_host_1@database%20name.indexeddb"));
|
| -
|
| -class TestOnWebKitThread : public ThreadTestHelper {
|
| - public:
|
| - TestOnWebKitThread()
|
| - : ThreadTestHelper(BrowserThread::WEBKIT) {
|
| - }
|
| -
|
| - const std::string& database_name() const { return database_name_; }
|
| - const WebKit::WebSecurityOrigin& security_origin() const {
|
| - return security_origin_;
|
| - }
|
| -
|
| - private:
|
| - virtual ~TestOnWebKitThread() {}
|
| -
|
| - virtual void RunTest() {
|
| - set_test_result(IndexedDBContext::SplitIndexedDBFileName(
|
| - kTestIndexedDBFile, &database_name_, &security_origin_));
|
| - }
|
| -
|
| - std::string database_name_;
|
| - WebKit::WebSecurityOrigin security_origin_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(TestOnWebKitThread);
|
| -};
|
| -
|
| -} // namespace
|
|
|
| // This browser test is aimed towards exercising the IndexedDB bindings and
|
| // the actual implementation that lives in the browser side (in_process_webkit).
|
| @@ -78,17 +41,6 @@ class IndexedDBBrowserTest : public InProcessBrowserTest {
|
| }
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, SplitFilename) {
|
| - scoped_refptr<TestOnWebKitThread> test_on_webkit_thread(
|
| - new TestOnWebKitThread);
|
| - ASSERT_TRUE(test_on_webkit_thread->Run());
|
| -
|
| - EXPECT_EQ("database name", test_on_webkit_thread->database_name());
|
| - std::string origin_str =
|
| - test_on_webkit_thread->security_origin().toString().utf8();
|
| - EXPECT_EQ("http://host:1", origin_str);
|
| -}
|
| -
|
| IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
|
| }
|
|
|