Merge branch 'rb32' of /cygdrive/y/nw9/src/content/nw/ into rb32

Conflicts:
	src/browser/shell_devtools_delegate.cc
	src/browser/shell_devtools_delegate.h
	src/chrome_breakpad_client.cc

Author: rogerwang

src/breakpad_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/app/breakpad_mac.h"
+#import "components/breakpad/app/breakpad_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
@@ -25,7 +25,7 @@
 #import "breakpad/src/client/mac/Framework/Breakpad.h"
 #include "chrome/common/child_process_logging.h"
 #include "content/public/common/content_switches.h"
-#include "components/breakpad/breakpad_client.h"
+#include "components/breakpad/app/breakpad_client.h"
 #include "content/nw/src/paths_mac.h"
 //#include "policy/policy_constants.h"
 
@@ -250,7 +250,7 @@ void InitCrashReporter() {
     // Get the guid from the command line switch.
     std::string guid =
         command_line->GetSwitchValueASCII(switches::kEnableCrashReporter);
-    child_process_logging::SetClientId(guid);
+    breakpad::GetBreakpadClient()->SetClientID(guid);
   }
 
   logging::SetLogMessageHandler(&FatalMessageHandler);

src/browser/shell_devtools_delegate.cc

@@ -68,13 +68,6 @@ std::string ShellDevToolsDelegate::GetPageThumbnailData(const GURL& url) {
   return "";
 }
 
-#if 0
-std::string ShellDevToolsDelegate::GetViewDescription(
-    content::RenderViewHost*) {
-  return std::string();
-}
-#endif
-
 scoped_ptr<net::StreamListenSocket>
 ShellDevToolsDelegate::CreateSocketForTethering(
     net::StreamListenSocket::Delegate* delegate,
@@ -84,8 +77,6 @@ ShellDevToolsDelegate::CreateSocketForTethering(
 
 const char kTargetTypePage[] = "page";
 
-std::string GetViewDescription(WebContents* web_contents);
-
 class Target : public content::DevToolsTarget {
  public:
   explicit Target(WebContents* web_contents);

src/browser/shell_devtools_delegate.h

@@ -54,7 +54,6 @@ class ShellDevToolsDelegate : public DevToolsHttpHandlerDelegate {
   virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE;
   virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) OVERRIDE;
   virtual void EnumerateTargets(TargetCallback callback) OVERRIDE;
-  // virtual std::string GetViewDescription(content::RenderViewHost*) OVERRIDE;
   virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
       std::string* name) OVERRIDE;

src/chrome_breakpad_client.cc

@@ -150,14 +150,6 @@ bool ChromeBreakpadClient::AboutToRestart() {
   return true;
 }
 
-#if 0
-base::string16 ChromeBreakpadClient::GetCrashGUID() {
-  std::wstring guid;
-  // GoogleUpdateSettings::GetMetricsId(&guid);
-  return base::WideToUTF16(guid);
-}
-#endif
-
 bool ChromeBreakpadClient::GetDeferredUploadsSupported(bool) {
   return false;
 }
@@ -173,6 +165,86 @@ bool ChromeBreakpadClient::GetShouldDumpLargerDumps(bool is_per_user_install) {
 int ChromeBreakpadClient::GetResultCodeRespawnFailed() {
   return chrome::RESULT_CODE_RESPAWN_FAILED;
 }
+
+void ChromeBreakpadClient::InitBrowserCrashDumpsRegKey() {
+  DCHECK(g_browser_crash_dump_regkey == NULL);
+
+  base::win::RegKey regkey;
+  if (regkey.Create(HKEY_CURRENT_USER,
+                    chrome::kBrowserCrashDumpAttemptsRegistryPath,
+                    KEY_ALL_ACCESS) != ERROR_SUCCESS) {
+    return;
+  }
+
+  // We use the current process id and the current tick count as a (hopefully)
+  // unique combination for the crash dump value. There's a small chance that
+  // across a reboot we might have a crash dump signal written, and the next
+  // browser process might have the same process id and tick count, but crash
+  // before consuming the signal (overwriting the signal with an identical one).
+  // For now, we're willing to live with that risk.
+  int length = base::strings::SafeSPrintf(g_browser_crash_dump_prefix,
+                                          kBrowserCrashDumpPrefixTemplate,
+                                          chrome::kChromeVersion,
+                                          ::GetCurrentProcessId(),
+                                          ::GetTickCount());
+  if (length <= 0) {
+    NOTREACHED();
+    g_browser_crash_dump_prefix[0] = '\0';
+    return;
+  }
+
+  // Hold the registry key in a global for update on crash dump.
+  g_browser_crash_dump_regkey = regkey.Take();
+}
+
+void ChromeBreakpadClient::RecordCrashDumpAttempt(bool is_real_crash) {
+  // If we're not a browser (or the registry is unavailable to us for some
+  // reason) then there's nothing to do.
+  if (g_browser_crash_dump_regkey == NULL)
+    return;
+
+  // Generate the final value name we'll use (appends the crash number to the
+  // base value name).
+  const size_t kMaxValueSize = 2 * kBrowserCrashDumpPrefixLength;
+  char value_name[kMaxValueSize + 1] = {};
+  int length = base::strings::SafeSPrintf(
+      value_name,
+      "%s-%x",
+      g_browser_crash_dump_prefix,
+      base::subtle::NoBarrier_AtomicIncrement(&g_browser_crash_dump_count, 1));
+
+  if (length > 0) {
+    DWORD value_dword = is_real_crash ? 1 : 0;
+    ::RegSetValueExA(g_browser_crash_dump_regkey, value_name, 0, REG_DWORD,
+                     reinterpret_cast<BYTE*>(&value_dword),
+                     sizeof(value_dword));
+  }
+}
+
+bool ChromeBreakpadClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
+// Determine whether configuration management allows loading the crash reporter.
+// Since the configuration management infrastructure is not initialized at this
+// point, we read the corresponding registry key directly. The return status
+// indicates whether policy data was successfully read. If it is true,
+// |breakpad_enabled| contains the value set by policy.
+  string16 key_name = UTF8ToUTF16(policy::key::kMetricsReportingEnabled);
+  DWORD value = 0;
+  base::win::RegKey hklm_policy_key(HKEY_LOCAL_MACHINE,
+                                    policy::kRegistryChromePolicyKey, KEY_READ);
+  if (hklm_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) {
+    *breakpad_enabled = value != 0;
+    return true;
+  }
+
+  base::win::RegKey hkcu_policy_key(HKEY_CURRENT_USER,
+                                    policy::kRegistryChromePolicyKey, KEY_READ);
+  if (hkcu_policy_key.ReadValueDW(key_name.c_str(), &value) == ERROR_SUCCESS) {
+    *breakpad_enabled = value != 0;
+    return true;
+  }
+
+  return false;
+}
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)

src/chrome_breakpad_client.h

@@ -30,11 +30,12 @@ class ChromeBreakpadClient : public breakpad::BreakpadClient {
                                        base::string16* message,
                                        bool* is_rtl_locale) OVERRIDE;
   virtual bool AboutToRestart() OVERRIDE;
-  virtual base::string16 GetCrashGUID() OVERRIDE;
   virtual bool GetDeferredUploadsSupported(bool is_per_user_install) OVERRIDE;
   virtual bool GetIsPerUserInstall(const base::FilePath& exe_path) OVERRIDE;
   virtual bool GetShouldDumpLargerDumps(bool is_per_user_install) OVERRIDE;
   virtual int GetResultCodeRespawnFailed() OVERRIDE;
+  virtual void InitBrowserCrashDumpsRegKey() OVERRIDE;
+  virtual void RecordCrashDumpAttempt(bool is_real_crash) OVERRIDE;
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_IOS)
@@ -55,6 +56,10 @@ class ChromeBreakpadClient : public breakpad::BreakpadClient {
 
   virtual bool GetCollectStatsConsent() OVERRIDE;
 
+#if defined(OS_WIN) || defined(OS_MACOSX)
+  virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled) OVERRIDE;
+#endif
+
 #if defined(OS_ANDROID)
   virtual int GetAndroidMinidumpDescriptor() OVERRIDE;
 #endif

src/chrome_breakpad_client_mac.mm

@@ -4,12 +4,22 @@
 
 #include "chrome/app/chrome_breakpad_client.h"
 
+#include <CoreFoundation/CoreFoundation.h>
+
 #include "base/command_line.h"
+#include "base/mac/scoped_cftyperef.h"
+#include "base/strings/sys_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
+//#include "policy/policy_constants.h"
+
 
 namespace chrome {
 
 void ChromeBreakpadClient::InstallAdditionalFilters(BreakpadRef breakpad) {
 }
 
+bool ChromeBreakpadClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
+  return false;
+}
+
 }  // namespace chrome

src/mac/app-Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.3</string>
+	<string>0.9.0</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>LSMinimumSystemVersion</key>

src/nw_version.h

@@ -22,8 +22,8 @@
 #define NW_VERSION_H
 
 #define NW_MAJOR_VERSION 0
-#define NW_MINOR_VERSION 8
-#define NW_PATCH_VERSION 3
+#define NW_MINOR_VERSION 9
+#define NW_PATCH_VERSION 0
 #define NW_VERSION_IS_RELEASE 0
 
 #ifndef NW_STRINGIFY

src/renderer/printing/print_web_view_helper_mac.mm

@@ -118,7 +118,7 @@
       params.display_header_footer ? gfx::Rect(*page_size) : content_area;
 
   {
-    SkDevice* device = metafile->StartPageForVectorCanvas(
+    SkBaseDevice* device = metafile->StartPageForVectorCanvas(
         *page_size, canvas_area, scale_factor);
     if (!device)
       return;

src/shell_content_browser_client.cc

@@ -28,7 +28,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
-#include "chrome/common/child_process_logging.h"
+//#include "chrome/common/child_process_logging.h"
+#include "components/breakpad/app/breakpad_client.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/nw/src/browser/printing/printing_message_filter.h"
@@ -151,8 +152,7 @@ void ShellContentBrowserClient::AppendExtraCommandLineSwitches(
     int child_process_id) {
 #if defined(OS_MACOSX)
   if (IsCrashReporterEnabled()) {
-    command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
-                                    child_process_logging::GetClientId());
+    command_line->AppendSwitch(switches::kEnableCrashReporter);
   }
 #elif defined(OS_POSIX)
   if (IsCrashReporterEnabled()) {