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

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

Issue 2967013002: Be explicit about namespace testing to not mix it with blink::testing (Closed)
Patch Set: Dropped mojo parts that need another review. Created 3 years, 5 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 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "core/frame/WebLocalFrameBase.h" 34 #include "core/frame/WebLocalFrameBase.h"
35 #include "platform/weborigin/KURL.h" 35 #include "platform/weborigin/KURL.h"
36 #include "platform/wtf/text/CString.h" 36 #include "platform/wtf/text/CString.h"
37 #include "platform/wtf/text/WTFString.h" 37 #include "platform/wtf/text/WTFString.h"
38 #include "public/web/WebFrameClient.h" 38 #include "public/web/WebFrameClient.h"
39 #include "public/web/WebSettings.h" 39 #include "public/web/WebSettings.h"
40 #include "public/web/WebView.h" 40 #include "public/web/WebView.h"
41 #include "testing/gmock/include/gmock/gmock.h" 41 #include "testing/gmock/include/gmock/gmock.h"
42 #include "testing/gtest/include/gtest/gtest.h" 42 #include "testing/gtest/include/gtest/gtest.h"
43 43
44 using testing::_; 44 using ::testing::_;
45 using testing::Mock; 45 using ::testing::Mock;
46 using testing::Return; 46 using ::testing::Return;
47 47
48 namespace blink { 48 namespace blink {
49 namespace { 49 namespace {
50 50
51 class MockWebFrameClient : public FrameTestHelpers::TestWebFrameClient { 51 class MockWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
52 public: 52 public:
53 ~MockWebFrameClient() override {} 53 ~MockWebFrameClient() override {}
54 54
55 MOCK_METHOD0(UserAgentOverride, WebString()); 55 MOCK_METHOD0(UserAgentOverride, WebString());
56 }; 56 };
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 Mock::VerifyAndClearExpectations(&WebFrameClient()); 104 Mock::VerifyAndClearExpectations(&WebFrameClient());
105 105
106 // Remove the override and make sure we get the original back. 106 // Remove the override and make sure we get the original back.
107 EXPECT_CALL(WebFrameClient(), UserAgentOverride()) 107 EXPECT_CALL(WebFrameClient(), UserAgentOverride())
108 .WillOnce(Return(WebString())); 108 .WillOnce(Return(WebString()));
109 EXPECT_TRUE(default_user_agent.Equals(UserAgent())); 109 EXPECT_TRUE(default_user_agent.Equals(UserAgent()));
110 } 110 }
111 111
112 } // namespace 112 } // namespace
113 } // namespace blink 113 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698