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

Side by Side Diff: third_party/WebKit/Source/web/tests/ActivityLoggerTest.cpp

Issue 2675303004: Move WebCache from public/web into public/platform (Closed)
Patch Set: . Created 3 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <v8.h>
5 #include "bindings/core/v8/ScriptController.h" 6 #include "bindings/core/v8/ScriptController.h"
6 #include "bindings/core/v8/ScriptSourceCode.h" 7 #include "bindings/core/v8/ScriptSourceCode.h"
7 #include "bindings/core/v8/V8Binding.h" 8 #include "bindings/core/v8/V8Binding.h"
8 #include "bindings/core/v8/V8DOMActivityLogger.h" 9 #include "bindings/core/v8/V8DOMActivityLogger.h"
9 #include "public/web/WebCache.h" 10 #include "public/platform/WebCache.h"
10 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
11 #include "web/WebLocalFrameImpl.h" 12 #include "web/WebLocalFrameImpl.h"
12 #include "web/tests/FrameTestHelpers.h" 13 #include "web/tests/FrameTestHelpers.h"
13 #include "wtf/Forward.h" 14 #include "wtf/Forward.h"
14 #include "wtf/PtrUtil.h" 15 #include "wtf/PtrUtil.h"
15 #include "wtf/text/Base64.h" 16 #include "wtf/text/Base64.h"
16 #include <v8.h>
17 17
18 namespace blink { 18 namespace blink {
19 19
20 using blink::FrameTestHelpers::WebViewHelper; 20 using blink::FrameTestHelpers::WebViewHelper;
21 using blink::FrameTestHelpers::pumpPendingRequestsForFrameToLoad; 21 using blink::FrameTestHelpers::pumpPendingRequestsForFrameToLoad;
22 22
23 class TestActivityLogger : public V8DOMActivityLogger { 23 class TestActivityLogger : public V8DOMActivityLogger {
24 public: 24 public:
25 ~TestActivityLogger() override {} 25 ~TestActivityLogger() override {}
26 26
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" 585 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n"
586 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n" 586 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n"
587 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n"; 587 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n";
588 executeScriptInMainWorld(code); 588 executeScriptInMainWorld(code);
589 ASSERT_TRUE(verifyActivities("")); 589 ASSERT_TRUE(verifyActivities(""));
590 executeScriptInIsolatedWorld(code); 590 executeScriptInIsolatedWorld(code);
591 ASSERT_TRUE(verifyActivities(expectedActivities)); 591 ASSERT_TRUE(verifyActivities(expectedActivities));
592 } 592 }
593 593
594 } // namespace blink 594 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698