Merge Crashpad to the 42.0.2311 branch

components/crash/app/crash_keys_win_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/crash/app/crash_keys_win.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/strings/stringprintf.h"
 #include "components/crash/app/crash_reporter_client.h"
@@ skipping 29 matching lines @@
 
   MOCK_METHOD2(GetProductNameAndVersion, void(std::string* product_name,
                                                 std::string* version));
   MOCK_METHOD0(GetReporterLogFilename, base::FilePath());
   MOCK_METHOD1(GetCrashDumpLocation, bool(base::FilePath* crash_dir));
   MOCK_METHOD0(RegisterCrashKeys, size_t());
   MOCK_METHOD0(IsRunningUnattended, bool());
   MOCK_METHOD0(GetCollectStatsConsent, bool());
   MOCK_METHOD1(ReportingIsEnforcedByPolicy, bool(bool* breakpad_enabled));
   MOCK_METHOD0(GetAndroidMinidumpDescriptor, int());
-#if defined(OS_MACOSX)
-  MOCK_METHOD1(InstallAdditionalFilters, void(BreakpadRef breakpad));
-#endif
   MOCK_METHOD1(EnableBreakpadForProcess, bool(const std::string& process_type));
 };
 
 class CrashKeysWinTest : public testing::Test {
  public:
 
   size_t CountKeyValueOccurences(
       const google_breakpad::CustomClientInfo* client_info,
       const wchar_t* key, const wchar_t* value);
 
@@ skipping 73 matching lines @@
   EXPECT_EQ(1, CountKeyValueOccurences(info, L"plat", L"Win32"));
   EXPECT_EQ(1, CountKeyValueOccurences(info, L"ptype", L"made_up_type"));
   std::wstring pid_str(base::StringPrintf(L"%d", ::GetCurrentProcessId()));
   EXPECT_EQ(1, CountKeyValueOccurences(info, L"pid", pid_str.c_str()));
   EXPECT_EQ(1, CountKeyValueOccurences(info, L"channel", L"-devm"));
   EXPECT_EQ(1, CountKeyValueOccurences(info, L"profile-type", L"temporary"));
   EXPECT_EQ(256, CountKeyValueOccurences(info, L"unspecified-crash-key", L""));
 }
 
 }  // namespace breakpad