diff --git a/metrics/libmetrics-293518.gyp b/metrics/libmetrics-293518.gyp
deleted file mode 100644
index 1b0f78c..0000000
--- a/metrics/libmetrics-293518.gyp
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  'variables': {
-    'libbase_ver': 293518,
-  },
-  'includes': [
-    '../metrics/libmetrics.gypi',
-  ],
-}
diff --git a/metrics/libmetrics-307740.gyp b/metrics/libmetrics-307740.gyp
new file mode 100644
index 0000000..42dd0da
--- /dev/null
+++ b/metrics/libmetrics-307740.gyp
@@ -0,0 +1,8 @@
+{
+  'variables': {
+    'libbase_ver': 307740,
+  },
+  'includes': [
+    'libmetrics.gypi',
+  ],
+}
diff --git a/metrics/metrics.gyp b/metrics/metrics.gyp
index 9614826..60e2d1a 100644
--- a/metrics/metrics.gyp
+++ b/metrics/metrics.gyp
@@ -94,6 +94,7 @@
         '<(proto_in_dir)/chrome_user_metrics_extension.proto',
         '<(proto_in_dir)/histogram_event.proto',
         '<(proto_in_dir)/omnibox_event.proto',
+        '<(proto_in_dir)/omnibox_input_type.proto',
         '<(proto_in_dir)/perf_data.proto',
         '<(proto_in_dir)/profiler_event.proto',
         '<(proto_in_dir)/sampled_profile.proto',
diff --git a/metrics/serialization/serialization_utils.cc b/metrics/serialization/serialization_utils.cc
index fea493e..80e81d2 100644
--- a/metrics/serialization/serialization_utils.cc
+++ b/metrics/serialization/serialization_utils.cc
@@ -9,8 +9,8 @@
 #include <string>
 #include <vector>
 
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -174,7 +174,7 @@
                                       READ_WRITE_ALL_FILE_FLAGS));
 
   if (file_descriptor.get() < 0) {
-    DLOG(ERROR) << "error openning the file";
+    DLOG(ERROR) << "error opening the file";
     return false;
   }
 
@@ -196,16 +196,15 @@
 
   // The file containing the metrics samples will only be read by programs on
   // the same device so we do not check endianness.
-  if (base::WriteFileDescriptor(file_descriptor.get(),
+  if (!base::WriteFileDescriptor(file_descriptor.get(),
                                  reinterpret_cast<char*>(&size),
-                                 sizeof(size)) != sizeof(size)) {
+                                 sizeof(size))) {
     DPLOG(ERROR) << "error writing message length";
     return false;
   }
 
-  if (base::WriteFileDescriptor(
-          file_descriptor.get(), msg.c_str(), msg.size()) !=
-      static_cast<int>(msg.size())) {
+  if (!base::WriteFileDescriptor(
+          file_descriptor.get(), msg.c_str(), msg.size())) {
     DPLOG(ERROR) << "error writing message";
     return false;
   }
diff --git a/metrics/serialization/serialization_utils_unittest.cc b/metrics/serialization/serialization_utils_unittest.cc
index d47fbc8..34d76cf 100644
--- a/metrics/serialization/serialization_utils_unittest.cc
+++ b/metrics/serialization/serialization_utils_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "metrics/serialization/serialization_utils.h"
 
-#include <base/file_util.h>
+#include <base/files/file_util.h>
 #include <base/files/scoped_temp_dir.h>
 #include <base/logging.h>
 #include <base/strings/stringprintf.h>
diff --git a/metrics/uploader/system_profile_cache.cc b/metrics/uploader/system_profile_cache.cc
index be3d8ec..54c2693 100644
--- a/metrics/uploader/system_profile_cache.cc
+++ b/metrics/uploader/system_profile_cache.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "uploader/system_profile_cache.h"
+#include "metrics/uploader/system_profile_cache.h"
 
 #include <glib.h>
 #include <string>