Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3

3 files changed, 13 insertions, 12 deletions

diff --git a/chrome_elf/blacklist/OWNERS b/chrome_elf/blacklist/OWNERS
new file mode 100644
index 0000000000..28a6a30558
--- /dev/null
+++ b/chrome_elf/blacklist/OWNERS
@@ -0,0 +1,3 @@
+caitkp@chromium.org
+csharp@chromium.org
+robertshield@chromium.org
diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc
index 705cc60828..a168c9a044 100644
--- a/chrome_elf/blacklist/blacklist.cc
+++ b/chrome_elf/blacklist/blacklist.cc
@@ -279,9 +279,6 @@ bool Initialize(bool force) {
     key = NULL;
   }
 
-  // Record that we have initialized the blacklist.
-  g_blacklist_initialized = true;
-
   BYTE* thunk_storage = reinterpret_cast<BYTE*>(&g_thunk_storage);
 
   // Mark the thunk storage as readable and writeable, since we
@@ -334,6 +331,9 @@ bool Initialize(bool force) {
 #endif
   delete thunk;
 
+  // Record if we have initialized the blacklist.
+  g_blacklist_initialized = NT_SUCCESS(ret);
+
   // Mark the thunk storage as executable and prevent any future writes to it.
   page_executable = page_executable && VirtualProtect(&g_thunk_storage,
                                                       sizeof(g_thunk_storage),
diff --git a/chrome_elf/breakpad.cc b/chrome_elf/breakpad.cc
index 17ddc8fd7e..4c20324b20 100644
--- a/chrome_elf/breakpad.cc
+++ b/chrome_elf/breakpad.cc
@@ -102,7 +102,7 @@ int GenerateCrashDump(EXCEPTION_POINTERS* exinfo) {
 
 void InitializeCrashReporting() {
   wchar_t exe_path[MAX_PATH] = {};
-  if(!::GetModuleFileName(NULL, exe_path, arraysize(exe_path)))
+  if (!::GetModuleFileName(NULL, exe_path, arraysize(exe_path)))
     return;
 
   // Disable the message box for assertions.
@@ -123,13 +123,10 @@ void InitializeCrashReporting() {
       MiniDumpWithIndirectlyReferencedMemory);  // Get memory referenced by
                                                 // stack.
 
-  // Convert #define to a variable so that we can use if() rather than
-  // #if below and so at least compile-test the Chrome code in
-  // Chromium builds.
-#if defined(GOOGLE_CHROME_BUILD)
-  bool is_chrome_build = true;
+#if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD)
+  bool is_official_chrome_build = true;
 #else
-  bool is_chrome_build = false;
+  bool is_official_chrome_build = false;
 #endif
 
   base::string16 pipe_name;
@@ -139,8 +136,9 @@ void InitializeCrashReporting() {
 
   if (!use_policy && IsHeadless()) {
     pipe_name = kChromePipeName;
-  } else if (use_policy ? enabled_by_policy :
-                          (is_chrome_build && AreUsageStatsEnabled(exe_path))) {
+  } else if (use_policy ?
+                 enabled_by_policy :
+                 (is_official_chrome_build && AreUsageStatsEnabled(exe_path))) {
     // Build the pipe name. It can be one of:
     // 32-bit system: \\.\pipe\GoogleCrashServices\S-1-5-18
     // 32-bit user: \\.\pipe\GoogleCrashServices\<user SID>