diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 01:30:43 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 01:30:43 +0000 |
| commit | c2bb2e5778d3a6a8a70e942c55693214c640a8ba (patch) | |
| tree | d88f91049b3147f1c49ac77918dfc128efe0fca6 /chrome_frame/chrome_frame_npapi_unittest.cc | |
| parent | aa142705a2dd4ea20e4ffe5c84dd35c1d02b813f (diff) | |
| download | chromium_src-c2bb2e5778d3a6a8a70e942c55693214c640a8ba.zip chromium_src-c2bb2e5778d3a6a8a70e942c55693214c640a8ba.tar.gz chromium_src-c2bb2e5778d3a6a8a70e942c55693214c640a8ba.tar.bz2 | |
Re-submit of GCF privacy patch in:
http://codereview.chromium.org/858003
But this time with unittests that pass.
BUG=22846
TEST=run unit tests, clear caches, see original CL for more details
Review URL: http://codereview.chromium.org/1343002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_npapi_unittest.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_npapi_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_npapi_unittest.cc b/chrome_frame/chrome_frame_npapi_unittest.cc index b30d5e8..6af670d 100644 --- a/chrome_frame/chrome_frame_npapi_unittest.cc +++ b/chrome_frame/chrome_frame_npapi_unittest.cc @@ -8,7 +8,6 @@ #include "chrome_frame/chrome_frame_npapi.h" #include "chrome_frame/ff_privilege_check.h" - TEST(ChromeFrameNPAPI, DoesNotCrashOnConstruction) { ChromeFrameNPAPI* api = new ChromeFrameNPAPI(); delete api; @@ -81,7 +80,7 @@ class MockNPAPI: public ChromeFrameNPAPI { class MockAutomationClient: public ChromeFrameAutomationClient { public: MOCK_METHOD6(Initialize, bool(ChromeFrameDelegate*, int, bool, - const std::wstring&, const std::wstring&, + const FilePath&, const std::wstring&, bool)); MOCK_METHOD1(SetEnableExtensionAutomation, void(const std::vector<std::string>&)); // NOLINT @@ -127,7 +126,7 @@ class TestNPAPIPrivilegedApi: public ::testing::Test { EXPECT_CALL(*mock_proxy, Initialize(_, _)).WillRepeatedly(Return(false)); EXPECT_CALL(*mock_automation, - Initialize(_, _, true, StrEq(profile_name), StrEq(extra_args), false)) + Initialize(_, _, true, _, StrEq(extra_args), false)) .WillOnce(Return(true)); if (expect_privilege_check) { |