summaryrefslogtreecommitdiffstats
path: root/mojo/shell
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 01:59:09 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 01:59:09 +0000
commit0f99844cb63471f828fb62a5105d07aaef63ec54 (patch)
tree8208b8f75342a68a7023980ff6245502b9cd4f16 /mojo/shell
parent4912961802e33de08bf6e6f9bbfe89bece472b70 (diff)
downloadchromium_src-0f99844cb63471f828fb62a5105d07aaef63ec54.zip
chromium_src-0f99844cb63471f828fb62a5105d07aaef63ec54.tar.gz
chromium_src-0f99844cb63471f828fb62a5105d07aaef63ec54.tar.bz2
Report PPAPI plugin load error code to UMA.
TBR=sky@chrmium.org BUG=353886 Review URL: https://codereview.chromium.org/206713004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell')
-rw-r--r--mojo/shell/app_child_process.cc5
-rw-r--r--mojo/shell/in_process_dynamic_service_runner.cc7
2 files changed, 7 insertions, 5 deletions
diff --git a/mojo/shell/app_child_process.cc b/mojo/shell/app_child_process.cc
index 732f89c..ebb10e6 100644
--- a/mojo/shell/app_child_process.cc
+++ b/mojo/shell/app_child_process.cc
@@ -233,11 +233,12 @@ class AppChildControllerImpl : public mojo_shell::AppChildController {
base::Bind(base::IgnoreResult(&base::DeleteFile), app_path, false));
do {
- std::string load_error;
+ base::NativeLibraryLoadError load_error;
base::ScopedNativeLibrary app_library(
base::LoadNativeLibrary(app_path, &load_error));
if (!app_library.is_valid()) {
- LOG(ERROR) << "Failed to load library (error: " << load_error << ")";
+ LOG(ERROR) << "Failed to load library (error: " << load_error.ToString()
+ << ")";
break;
}
diff --git a/mojo/shell/in_process_dynamic_service_runner.cc b/mojo/shell/in_process_dynamic_service_runner.cc
index 62ca5e3..9030d59 100644
--- a/mojo/shell/in_process_dynamic_service_runner.cc
+++ b/mojo/shell/in_process_dynamic_service_runner.cc
@@ -54,11 +54,12 @@ void InProcessDynamicServiceRunner::Run() {
base::Bind(base::IgnoreResult(&base::DeleteFile), app_path_, false));
do {
- std::string load_error;
+ base::NativeLibraryLoadError error;
base::ScopedNativeLibrary app_library(
- base::LoadNativeLibrary(app_path_, &load_error));
+ base::LoadNativeLibrary(app_path_, &error));
if (!app_library.is_valid()) {
- LOG(ERROR) << "Failed to load library (error: " << load_error << ")";
+ LOG(ERROR) << "Failed to load library (error: " << error.ToString()
+ << ")";
break;
}