diff --git a/libweave/libweave.gypi b/libweave/libweave.gypi
index 3c76bfd..1e42f83 100644
--- a/libweave/libweave.gypi
+++ b/libweave/libweave.gypi
@@ -4,9 +4,6 @@
 {
   'variables': {
     'weave_sources': [
-      'external/crypto/p224.cc',
-      'external/crypto/p224_spake.cc',
-      'external/crypto/sha2.cc',
       'src/backoff_entry.cc',
       'src/base_api_handler.cc',
       'src/commands/cloud_command_proxy.cc',
@@ -53,6 +50,9 @@
       'src/streams.cc',
       'src/string_utils.cc',
       'src/utils.cc',
+      'third_party/chromium/crypto/p224.cc',
+      'third_party/chromium/crypto/p224_spake.cc',
+      'third_party/chromium/crypto/sha2.cc',
       'third_party/modp_b64/modp_b64.cc',
     ],
     'weave_test_sources': [
@@ -62,9 +62,6 @@
       'src/test/unittest_utils.cc',
     ],
     'weave_unittest_sources': [
-      'external/crypto/p224_spake_unittest.cc',
-      'external/crypto/p224_unittest.cc',
-      'external/crypto/sha2_unittest.cc',
       'src/backoff_entry_unittest.cc',
       'src/base_api_handler_unittest.cc',
       'src/commands/cloud_command_proxy_unittest.cc',
@@ -93,66 +90,69 @@
       'src/streams_unittest.cc',
       'src/string_utils_unittest.cc',
       'src/test/weave_testrunner.cc',
+      'third_party/chromium/crypto/p224_spake_unittest.cc',
+      'third_party/chromium/crypto/p224_unittest.cc',
+      'third_party/chromium/crypto/sha2_unittest.cc',
     ],
     'weave_exports_unittest_sources': [
       'src/test/weave_testrunner.cc',
       'src/weave_unittest.cc',
     ],
     'base_sources': [
-      'external/base/bind_helpers.cc',
-      'external/base/callback_internal.cc',
-      'external/base/guid_posix.cc',
-      'external/base/json/json_parser.cc',
-      'external/base/json/json_reader.cc',
-      'external/base/json/json_writer.cc',
-      'external/base/json/string_escape.cc',
-      'external/base/memory/ref_counted.cc',
-      'external/base/logging.cc',
-      'external/base/location.cc',
-      'external/base/memory/weak_ptr.cc',
-      'external/base/memory/weak_ptr.cc',
-      'external/base/rand_util.cc',
-      'external/base/rand_util_posix.cc',
-      'external/base/strings/string_number_conversions.cc',
-      'external/base/strings/string_piece.cc',
-      'external/base/strings/stringprintf.cc',
-      'external/base/strings/string_util.cc',
-      'external/base/strings/string_util_constants.cc',
-      'external/base/strings/utf_string_conversion_utils.cc',
-      'external/base/third_party/dmg_fp/g_fmt.cc',
-      'external/base/third_party/dmg_fp/dtoa.cc',
-      'external/base/third_party/icu/icu_utf.cc',
-      'external/base/time/clock.cc',
-      'external/base/time/time.cc',
-      'external/base/time/time_posix.cc',
-      'external/base/values.cc',
+      'third_party/chromium/base/bind_helpers.cc',
+      'third_party/chromium/base/callback_internal.cc',
+      'third_party/chromium/base/guid_posix.cc',
+      'third_party/chromium/base/json/json_parser.cc',
+      'third_party/chromium/base/json/json_reader.cc',
+      'third_party/chromium/base/json/json_writer.cc',
+      'third_party/chromium/base/json/string_escape.cc',
+      'third_party/chromium/base/memory/ref_counted.cc',
+      'third_party/chromium/base/logging.cc',
+      'third_party/chromium/base/location.cc',
+      'third_party/chromium/base/memory/weak_ptr.cc',
+      'third_party/chromium/base/memory/weak_ptr.cc',
+      'third_party/chromium/base/rand_util.cc',
+      'third_party/chromium/base/rand_util_posix.cc',
+      'third_party/chromium/base/strings/string_number_conversions.cc',
+      'third_party/chromium/base/strings/string_piece.cc',
+      'third_party/chromium/base/strings/stringprintf.cc',
+      'third_party/chromium/base/strings/string_util.cc',
+      'third_party/chromium/base/strings/string_util_constants.cc',
+      'third_party/chromium/base/strings/utf_string_conversion_utils.cc',
+      'third_party/chromium/base/third_party/dmg_fp/g_fmt.cc',
+      'third_party/chromium/base/third_party/dmg_fp/dtoa.cc',
+      'third_party/chromium/base/third_party/icu/icu_utf.cc',
+      'third_party/chromium/base/time/clock.cc',
+      'third_party/chromium/base/time/time.cc',
+      'third_party/chromium/base/time/time_posix.cc',
+      'third_party/chromium/base/values.cc',
     ],
     'base_unittests': [
-      'external/base/bind_unittest.cc',
-      'external/base/callback_list_unittest.cc',
-      'external/base/callback_unittest.cc',
-      'external/base/guid_unittest.cc',
-      'external/base/json/json_parser_unittest.cc',
-      'external/base/json/json_reader_unittest.cc',
-      'external/base/json/json_writer_unittest.cc',
-      'external/base/json/string_escape_unittest.cc',
-      'external/base/logging_unittest.cc',
-      'external/base/memory/ref_counted_unittest.cc',
-      'external/base/memory/scoped_ptr_unittest.cc',
-      'external/base/memory/weak_ptr_unittest.cc',
-      'external/base/move_unittest.cc',
-      'external/base/numerics/safe_numerics_unittest.cc',
-      'external/base/observer_list_unittest.cc',
-      'external/base/rand_util_unittest.cc',
-      'external/base/scoped_clear_errno_unittest.cc',
-      'external/base/strings/string_number_conversions_unittest.cc',
-      'external/base/strings/string_piece_unittest.cc',
-      'external/base/strings/string_util_unittest.cc',
-      'external/base/strings/stringprintf_unittest.cc',
-      'external/base/template_util_unittest.cc',
-      'external/base/time/time_unittest.cc',
-      'external/base/tuple_unittest.cc',
-      'external/base/values_unittest.cc',
+      'third_party/chromium/base/bind_unittest.cc',
+      'third_party/chromium/base/callback_list_unittest.cc',
+      'third_party/chromium/base/callback_unittest.cc',
+      'third_party/chromium/base/guid_unittest.cc',
+      'third_party/chromium/base/json/json_parser_unittest.cc',
+      'third_party/chromium/base/json/json_reader_unittest.cc',
+      'third_party/chromium/base/json/json_writer_unittest.cc',
+      'third_party/chromium/base/json/string_escape_unittest.cc',
+      'third_party/chromium/base/logging_unittest.cc',
+      'third_party/chromium/base/memory/ref_counted_unittest.cc',
+      'third_party/chromium/base/memory/scoped_ptr_unittest.cc',
+      'third_party/chromium/base/memory/weak_ptr_unittest.cc',
+      'third_party/chromium/base/move_unittest.cc',
+      'third_party/chromium/base/numerics/safe_numerics_unittest.cc',
+      'third_party/chromium/base/observer_list_unittest.cc',
+      'third_party/chromium/base/rand_util_unittest.cc',
+      'third_party/chromium/base/scoped_clear_errno_unittest.cc',
+      'third_party/chromium/base/strings/string_number_conversions_unittest.cc',
+      'third_party/chromium/base/strings/string_piece_unittest.cc',
+      'third_party/chromium/base/strings/string_util_unittest.cc',
+      'third_party/chromium/base/strings/stringprintf_unittest.cc',
+      'third_party/chromium/base/template_util_unittest.cc',
+      'third_party/chromium/base/time/time_unittest.cc',
+      'third_party/chromium/base/tuple_unittest.cc',
+      'third_party/chromium/base/values_unittest.cc',
     ],
   },
 }
diff --git a/libweave/libweave_common.gypi b/libweave/libweave_common.gypi
index e201063..125047d 100644
--- a/libweave/libweave_common.gypi
+++ b/libweave/libweave_common.gypi
@@ -24,7 +24,7 @@
     'include_dirs': [
       '.',
       'include',
-      'external',
+      'third_party/chromium',
       'third_party/include',
       'third_party/modp_b64/modp_b64',
     ],
diff --git a/libweave/src/privet/security_manager.cc b/libweave/src/privet/security_manager.cc
index 4109cfc..8b1500c 100644
--- a/libweave/src/privet/security_manager.cc
+++ b/libweave/src/privet/security_manager.cc
@@ -18,11 +18,11 @@
 #include <base/time/time.h>
 #include <weave/provider/task_runner.h>
 
-#include "external/crypto/p224_spake.h"
 #include "src/data_encoding.h"
 #include "src/privet/constants.h"
 #include "src/privet/openssl_utils.h"
 #include "src/string_utils.h"
+#include "third_party/chromium/crypto/p224_spake.h"
 
 namespace weave {
 namespace privet {
diff --git a/libweave/src/privet/security_manager_unittest.cc b/libweave/src/privet/security_manager_unittest.cc
index 2927154..7229710 100644
--- a/libweave/src/privet/security_manager_unittest.cc
+++ b/libweave/src/privet/security_manager_unittest.cc
@@ -21,9 +21,9 @@
 #include <gtest/gtest.h>
 #include <weave/provider/test/fake_task_runner.h>
 
-#include "external/crypto/p224_spake.h"
 #include "src/data_encoding.h"
 #include "src/privet/openssl_utils.h"
+#include "third_party/chromium/crypto/p224_spake.h"
 
 using testing::Eq;
 using testing::_;
diff --git a/libweave/external/LICENSE b/libweave/third_party/chromium/LICENSE
similarity index 100%
rename from libweave/external/LICENSE
rename to libweave/third_party/chromium/LICENSE
diff --git a/libweave/external/LICENSE.chromium_os b/libweave/third_party/chromium/LICENSE.chromium_os
similarity index 100%
rename from libweave/external/LICENSE.chromium_os
rename to libweave/third_party/chromium/LICENSE.chromium_os
diff --git a/libweave/external/base/base_export.h b/libweave/third_party/chromium/base/base_export.h
similarity index 100%
rename from libweave/external/base/base_export.h
rename to libweave/third_party/chromium/base/base_export.h
diff --git a/libweave/external/base/basictypes.h b/libweave/third_party/chromium/base/basictypes.h
similarity index 100%
rename from libweave/external/base/basictypes.h
rename to libweave/third_party/chromium/base/basictypes.h
diff --git a/libweave/external/base/bind.h b/libweave/third_party/chromium/base/bind.h
similarity index 100%
rename from libweave/external/base/bind.h
rename to libweave/third_party/chromium/base/bind.h
diff --git a/libweave/external/base/bind_helpers.cc b/libweave/third_party/chromium/base/bind_helpers.cc
similarity index 100%
rename from libweave/external/base/bind_helpers.cc
rename to libweave/third_party/chromium/base/bind_helpers.cc
diff --git a/libweave/external/base/bind_helpers.h b/libweave/third_party/chromium/base/bind_helpers.h
similarity index 100%
rename from libweave/external/base/bind_helpers.h
rename to libweave/third_party/chromium/base/bind_helpers.h
diff --git a/libweave/external/base/bind_internal.h b/libweave/third_party/chromium/base/bind_internal.h
similarity index 100%
rename from libweave/external/base/bind_internal.h
rename to libweave/third_party/chromium/base/bind_internal.h
diff --git a/libweave/external/base/bind_unittest.cc b/libweave/third_party/chromium/base/bind_unittest.cc
similarity index 100%
rename from libweave/external/base/bind_unittest.cc
rename to libweave/third_party/chromium/base/bind_unittest.cc
diff --git a/libweave/external/base/build/build_config.h b/libweave/third_party/chromium/base/build/build_config.h
similarity index 100%
rename from libweave/external/base/build/build_config.h
rename to libweave/third_party/chromium/base/build/build_config.h
diff --git a/libweave/external/base/callback.h b/libweave/third_party/chromium/base/callback.h
similarity index 100%
rename from libweave/external/base/callback.h
rename to libweave/third_party/chromium/base/callback.h
diff --git a/libweave/external/base/callback_forward.h b/libweave/third_party/chromium/base/callback_forward.h
similarity index 100%
rename from libweave/external/base/callback_forward.h
rename to libweave/third_party/chromium/base/callback_forward.h
diff --git a/libweave/external/base/callback_internal.cc b/libweave/third_party/chromium/base/callback_internal.cc
similarity index 100%
rename from libweave/external/base/callback_internal.cc
rename to libweave/third_party/chromium/base/callback_internal.cc
diff --git a/libweave/external/base/callback_internal.h b/libweave/third_party/chromium/base/callback_internal.h
similarity index 100%
rename from libweave/external/base/callback_internal.h
rename to libweave/third_party/chromium/base/callback_internal.h
diff --git a/libweave/external/base/callback_list.h b/libweave/third_party/chromium/base/callback_list.h
similarity index 100%
rename from libweave/external/base/callback_list.h
rename to libweave/third_party/chromium/base/callback_list.h
diff --git a/libweave/external/base/callback_list_unittest.cc b/libweave/third_party/chromium/base/callback_list_unittest.cc
similarity index 100%
rename from libweave/external/base/callback_list_unittest.cc
rename to libweave/third_party/chromium/base/callback_list_unittest.cc
diff --git a/libweave/external/base/callback_unittest.cc b/libweave/third_party/chromium/base/callback_unittest.cc
similarity index 100%
rename from libweave/external/base/callback_unittest.cc
rename to libweave/third_party/chromium/base/callback_unittest.cc
diff --git a/libweave/external/base/command_line.h b/libweave/third_party/chromium/base/command_line.h
similarity index 100%
rename from libweave/external/base/command_line.h
rename to libweave/third_party/chromium/base/command_line.h
diff --git a/libweave/external/base/compiler_specific.h b/libweave/third_party/chromium/base/compiler_specific.h
similarity index 100%
rename from libweave/external/base/compiler_specific.h
rename to libweave/third_party/chromium/base/compiler_specific.h
diff --git a/libweave/external/base/gtest_prod_util.h b/libweave/third_party/chromium/base/gtest_prod_util.h
similarity index 100%
rename from libweave/external/base/gtest_prod_util.h
rename to libweave/third_party/chromium/base/gtest_prod_util.h
diff --git a/libweave/external/base/guid.h b/libweave/third_party/chromium/base/guid.h
similarity index 100%
rename from libweave/external/base/guid.h
rename to libweave/third_party/chromium/base/guid.h
diff --git a/libweave/external/base/guid_posix.cc b/libweave/third_party/chromium/base/guid_posix.cc
similarity index 100%
rename from libweave/external/base/guid_posix.cc
rename to libweave/third_party/chromium/base/guid_posix.cc
diff --git a/libweave/external/base/guid_unittest.cc b/libweave/third_party/chromium/base/guid_unittest.cc
similarity index 100%
rename from libweave/external/base/guid_unittest.cc
rename to libweave/third_party/chromium/base/guid_unittest.cc
diff --git a/libweave/external/base/json/json_parser.cc b/libweave/third_party/chromium/base/json/json_parser.cc
similarity index 100%
rename from libweave/external/base/json/json_parser.cc
rename to libweave/third_party/chromium/base/json/json_parser.cc
diff --git a/libweave/external/base/json/json_parser.h b/libweave/third_party/chromium/base/json/json_parser.h
similarity index 100%
rename from libweave/external/base/json/json_parser.h
rename to libweave/third_party/chromium/base/json/json_parser.h
diff --git a/libweave/external/base/json/json_parser_unittest.cc b/libweave/third_party/chromium/base/json/json_parser_unittest.cc
similarity index 100%
rename from libweave/external/base/json/json_parser_unittest.cc
rename to libweave/third_party/chromium/base/json/json_parser_unittest.cc
diff --git a/libweave/external/base/json/json_reader.cc b/libweave/third_party/chromium/base/json/json_reader.cc
similarity index 100%
rename from libweave/external/base/json/json_reader.cc
rename to libweave/third_party/chromium/base/json/json_reader.cc
diff --git a/libweave/external/base/json/json_reader.h b/libweave/third_party/chromium/base/json/json_reader.h
similarity index 100%
rename from libweave/external/base/json/json_reader.h
rename to libweave/third_party/chromium/base/json/json_reader.h
diff --git a/libweave/external/base/json/json_reader_unittest.cc b/libweave/third_party/chromium/base/json/json_reader_unittest.cc
similarity index 100%
rename from libweave/external/base/json/json_reader_unittest.cc
rename to libweave/third_party/chromium/base/json/json_reader_unittest.cc
diff --git a/libweave/external/base/json/json_writer.cc b/libweave/third_party/chromium/base/json/json_writer.cc
similarity index 100%
rename from libweave/external/base/json/json_writer.cc
rename to libweave/third_party/chromium/base/json/json_writer.cc
diff --git a/libweave/external/base/json/json_writer.h b/libweave/third_party/chromium/base/json/json_writer.h
similarity index 100%
rename from libweave/external/base/json/json_writer.h
rename to libweave/third_party/chromium/base/json/json_writer.h
diff --git a/libweave/external/base/json/json_writer_unittest.cc b/libweave/third_party/chromium/base/json/json_writer_unittest.cc
similarity index 100%
rename from libweave/external/base/json/json_writer_unittest.cc
rename to libweave/third_party/chromium/base/json/json_writer_unittest.cc
diff --git a/libweave/external/base/json/string_escape.cc b/libweave/third_party/chromium/base/json/string_escape.cc
similarity index 100%
rename from libweave/external/base/json/string_escape.cc
rename to libweave/third_party/chromium/base/json/string_escape.cc
diff --git a/libweave/external/base/json/string_escape.h b/libweave/third_party/chromium/base/json/string_escape.h
similarity index 100%
rename from libweave/external/base/json/string_escape.h
rename to libweave/third_party/chromium/base/json/string_escape.h
diff --git a/libweave/external/base/json/string_escape_unittest.cc b/libweave/third_party/chromium/base/json/string_escape_unittest.cc
similarity index 100%
rename from libweave/external/base/json/string_escape_unittest.cc
rename to libweave/third_party/chromium/base/json/string_escape_unittest.cc
diff --git a/libweave/external/base/location.cc b/libweave/third_party/chromium/base/location.cc
similarity index 100%
rename from libweave/external/base/location.cc
rename to libweave/third_party/chromium/base/location.cc
diff --git a/libweave/external/base/location.h b/libweave/third_party/chromium/base/location.h
similarity index 100%
rename from libweave/external/base/location.h
rename to libweave/third_party/chromium/base/location.h
diff --git a/libweave/external/base/logging.cc b/libweave/third_party/chromium/base/logging.cc
similarity index 100%
rename from libweave/external/base/logging.cc
rename to libweave/third_party/chromium/base/logging.cc
diff --git a/libweave/external/base/logging.h b/libweave/third_party/chromium/base/logging.h
similarity index 100%
rename from libweave/external/base/logging.h
rename to libweave/third_party/chromium/base/logging.h
diff --git a/libweave/external/base/logging_unittest.cc b/libweave/third_party/chromium/base/logging_unittest.cc
similarity index 100%
rename from libweave/external/base/logging_unittest.cc
rename to libweave/third_party/chromium/base/logging_unittest.cc
diff --git a/libweave/external/base/macros.h b/libweave/third_party/chromium/base/macros.h
similarity index 100%
rename from libweave/external/base/macros.h
rename to libweave/third_party/chromium/base/macros.h
diff --git a/libweave/external/base/memory/ref_counted.cc b/libweave/third_party/chromium/base/memory/ref_counted.cc
similarity index 100%
rename from libweave/external/base/memory/ref_counted.cc
rename to libweave/third_party/chromium/base/memory/ref_counted.cc
diff --git a/libweave/external/base/memory/ref_counted.h b/libweave/third_party/chromium/base/memory/ref_counted.h
similarity index 100%
rename from libweave/external/base/memory/ref_counted.h
rename to libweave/third_party/chromium/base/memory/ref_counted.h
diff --git a/libweave/external/base/memory/ref_counted_unittest.cc b/libweave/third_party/chromium/base/memory/ref_counted_unittest.cc
similarity index 100%
rename from libweave/external/base/memory/ref_counted_unittest.cc
rename to libweave/third_party/chromium/base/memory/ref_counted_unittest.cc
diff --git a/libweave/external/base/memory/scoped_ptr.h b/libweave/third_party/chromium/base/memory/scoped_ptr.h
similarity index 100%
rename from libweave/external/base/memory/scoped_ptr.h
rename to libweave/third_party/chromium/base/memory/scoped_ptr.h
diff --git a/libweave/external/base/memory/scoped_ptr_unittest.cc b/libweave/third_party/chromium/base/memory/scoped_ptr_unittest.cc
similarity index 100%
rename from libweave/external/base/memory/scoped_ptr_unittest.cc
rename to libweave/third_party/chromium/base/memory/scoped_ptr_unittest.cc
diff --git a/libweave/external/base/memory/weak_ptr.cc b/libweave/third_party/chromium/base/memory/weak_ptr.cc
similarity index 100%
rename from libweave/external/base/memory/weak_ptr.cc
rename to libweave/third_party/chromium/base/memory/weak_ptr.cc
diff --git a/libweave/external/base/memory/weak_ptr.h b/libweave/third_party/chromium/base/memory/weak_ptr.h
similarity index 100%
rename from libweave/external/base/memory/weak_ptr.h
rename to libweave/third_party/chromium/base/memory/weak_ptr.h
diff --git a/libweave/external/base/memory/weak_ptr_unittest.cc b/libweave/third_party/chromium/base/memory/weak_ptr_unittest.cc
similarity index 100%
rename from libweave/external/base/memory/weak_ptr_unittest.cc
rename to libweave/third_party/chromium/base/memory/weak_ptr_unittest.cc
diff --git a/libweave/external/base/move.h b/libweave/third_party/chromium/base/move.h
similarity index 100%
rename from libweave/external/base/move.h
rename to libweave/third_party/chromium/base/move.h
diff --git a/libweave/external/base/move_unittest.cc b/libweave/third_party/chromium/base/move_unittest.cc
similarity index 100%
rename from libweave/external/base/move_unittest.cc
rename to libweave/third_party/chromium/base/move_unittest.cc
diff --git a/libweave/external/base/numerics/safe_conversions.h b/libweave/third_party/chromium/base/numerics/safe_conversions.h
similarity index 100%
rename from libweave/external/base/numerics/safe_conversions.h
rename to libweave/third_party/chromium/base/numerics/safe_conversions.h
diff --git a/libweave/external/base/numerics/safe_conversions_impl.h b/libweave/third_party/chromium/base/numerics/safe_conversions_impl.h
similarity index 100%
rename from libweave/external/base/numerics/safe_conversions_impl.h
rename to libweave/third_party/chromium/base/numerics/safe_conversions_impl.h
diff --git a/libweave/external/base/numerics/safe_math.h b/libweave/third_party/chromium/base/numerics/safe_math.h
similarity index 100%
rename from libweave/external/base/numerics/safe_math.h
rename to libweave/third_party/chromium/base/numerics/safe_math.h
diff --git a/libweave/external/base/numerics/safe_math_impl.h b/libweave/third_party/chromium/base/numerics/safe_math_impl.h
similarity index 100%
rename from libweave/external/base/numerics/safe_math_impl.h
rename to libweave/third_party/chromium/base/numerics/safe_math_impl.h
diff --git a/libweave/external/base/numerics/safe_numerics_unittest.cc b/libweave/third_party/chromium/base/numerics/safe_numerics_unittest.cc
similarity index 100%
rename from libweave/external/base/numerics/safe_numerics_unittest.cc
rename to libweave/third_party/chromium/base/numerics/safe_numerics_unittest.cc
diff --git a/libweave/external/base/observer_list.h b/libweave/third_party/chromium/base/observer_list.h
similarity index 100%
rename from libweave/external/base/observer_list.h
rename to libweave/third_party/chromium/base/observer_list.h
diff --git a/libweave/external/base/observer_list_unittest.cc b/libweave/third_party/chromium/base/observer_list_unittest.cc
similarity index 100%
rename from libweave/external/base/observer_list_unittest.cc
rename to libweave/third_party/chromium/base/observer_list_unittest.cc
diff --git a/libweave/external/base/posix/eintr_wrapper.h b/libweave/third_party/chromium/base/posix/eintr_wrapper.h
similarity index 100%
rename from libweave/external/base/posix/eintr_wrapper.h
rename to libweave/third_party/chromium/base/posix/eintr_wrapper.h
diff --git a/libweave/external/base/rand_util.cc b/libweave/third_party/chromium/base/rand_util.cc
similarity index 100%
rename from libweave/external/base/rand_util.cc
rename to libweave/third_party/chromium/base/rand_util.cc
diff --git a/libweave/external/base/rand_util.h b/libweave/third_party/chromium/base/rand_util.h
similarity index 100%
rename from libweave/external/base/rand_util.h
rename to libweave/third_party/chromium/base/rand_util.h
diff --git a/libweave/external/base/rand_util_posix.cc b/libweave/third_party/chromium/base/rand_util_posix.cc
similarity index 100%
rename from libweave/external/base/rand_util_posix.cc
rename to libweave/third_party/chromium/base/rand_util_posix.cc
diff --git a/libweave/external/base/rand_util_unittest.cc b/libweave/third_party/chromium/base/rand_util_unittest.cc
similarity index 100%
rename from libweave/external/base/rand_util_unittest.cc
rename to libweave/third_party/chromium/base/rand_util_unittest.cc
diff --git a/libweave/external/base/scoped_clear_errno.h b/libweave/third_party/chromium/base/scoped_clear_errno.h
similarity index 100%
rename from libweave/external/base/scoped_clear_errno.h
rename to libweave/third_party/chromium/base/scoped_clear_errno.h
diff --git a/libweave/external/base/scoped_clear_errno_unittest.cc b/libweave/third_party/chromium/base/scoped_clear_errno_unittest.cc
similarity index 100%
rename from libweave/external/base/scoped_clear_errno_unittest.cc
rename to libweave/third_party/chromium/base/scoped_clear_errno_unittest.cc
diff --git a/libweave/external/base/scoped_observer.h b/libweave/third_party/chromium/base/scoped_observer.h
similarity index 100%
rename from libweave/external/base/scoped_observer.h
rename to libweave/third_party/chromium/base/scoped_observer.h
diff --git a/libweave/external/base/strings/string_number_conversions.cc b/libweave/third_party/chromium/base/strings/string_number_conversions.cc
similarity index 100%
rename from libweave/external/base/strings/string_number_conversions.cc
rename to libweave/third_party/chromium/base/strings/string_number_conversions.cc
diff --git a/libweave/external/base/strings/string_number_conversions.h b/libweave/third_party/chromium/base/strings/string_number_conversions.h
similarity index 100%
rename from libweave/external/base/strings/string_number_conversions.h
rename to libweave/third_party/chromium/base/strings/string_number_conversions.h
diff --git a/libweave/external/base/strings/string_number_conversions_unittest.cc b/libweave/third_party/chromium/base/strings/string_number_conversions_unittest.cc
similarity index 100%
rename from libweave/external/base/strings/string_number_conversions_unittest.cc
rename to libweave/third_party/chromium/base/strings/string_number_conversions_unittest.cc
diff --git a/libweave/external/base/strings/string_piece.cc b/libweave/third_party/chromium/base/strings/string_piece.cc
similarity index 100%
rename from libweave/external/base/strings/string_piece.cc
rename to libweave/third_party/chromium/base/strings/string_piece.cc
diff --git a/libweave/external/base/strings/string_piece.h b/libweave/third_party/chromium/base/strings/string_piece.h
similarity index 100%
rename from libweave/external/base/strings/string_piece.h
rename to libweave/third_party/chromium/base/strings/string_piece.h
diff --git a/libweave/external/base/strings/string_piece_unittest.cc b/libweave/third_party/chromium/base/strings/string_piece_unittest.cc
similarity index 100%
rename from libweave/external/base/strings/string_piece_unittest.cc
rename to libweave/third_party/chromium/base/strings/string_piece_unittest.cc
diff --git a/libweave/external/base/strings/string_util.cc b/libweave/third_party/chromium/base/strings/string_util.cc
similarity index 100%
rename from libweave/external/base/strings/string_util.cc
rename to libweave/third_party/chromium/base/strings/string_util.cc
diff --git a/libweave/external/base/strings/string_util.h b/libweave/third_party/chromium/base/strings/string_util.h
similarity index 100%
rename from libweave/external/base/strings/string_util.h
rename to libweave/third_party/chromium/base/strings/string_util.h
diff --git a/libweave/external/base/strings/string_util_constants.cc b/libweave/third_party/chromium/base/strings/string_util_constants.cc
similarity index 100%
rename from libweave/external/base/strings/string_util_constants.cc
rename to libweave/third_party/chromium/base/strings/string_util_constants.cc
diff --git a/libweave/external/base/strings/string_util_posix.h b/libweave/third_party/chromium/base/strings/string_util_posix.h
similarity index 100%
rename from libweave/external/base/strings/string_util_posix.h
rename to libweave/third_party/chromium/base/strings/string_util_posix.h
diff --git a/libweave/external/base/strings/string_util_unittest.cc b/libweave/third_party/chromium/base/strings/string_util_unittest.cc
similarity index 100%
rename from libweave/external/base/strings/string_util_unittest.cc
rename to libweave/third_party/chromium/base/strings/string_util_unittest.cc
diff --git a/libweave/external/base/strings/stringprintf.cc b/libweave/third_party/chromium/base/strings/stringprintf.cc
similarity index 100%
rename from libweave/external/base/strings/stringprintf.cc
rename to libweave/third_party/chromium/base/strings/stringprintf.cc
diff --git a/libweave/external/base/strings/stringprintf.h b/libweave/third_party/chromium/base/strings/stringprintf.h
similarity index 100%
rename from libweave/external/base/strings/stringprintf.h
rename to libweave/third_party/chromium/base/strings/stringprintf.h
diff --git a/libweave/external/base/strings/stringprintf_unittest.cc b/libweave/third_party/chromium/base/strings/stringprintf_unittest.cc
similarity index 100%
rename from libweave/external/base/strings/stringprintf_unittest.cc
rename to libweave/third_party/chromium/base/strings/stringprintf_unittest.cc
diff --git a/libweave/external/base/strings/utf_string_conversion_utils.cc b/libweave/third_party/chromium/base/strings/utf_string_conversion_utils.cc
similarity index 100%
rename from libweave/external/base/strings/utf_string_conversion_utils.cc
rename to libweave/third_party/chromium/base/strings/utf_string_conversion_utils.cc
diff --git a/libweave/external/base/strings/utf_string_conversion_utils.h b/libweave/third_party/chromium/base/strings/utf_string_conversion_utils.h
similarity index 100%
rename from libweave/external/base/strings/utf_string_conversion_utils.h
rename to libweave/third_party/chromium/base/strings/utf_string_conversion_utils.h
diff --git a/libweave/external/base/template_util.h b/libweave/third_party/chromium/base/template_util.h
similarity index 100%
rename from libweave/external/base/template_util.h
rename to libweave/third_party/chromium/base/template_util.h
diff --git a/libweave/external/base/template_util_unittest.cc b/libweave/third_party/chromium/base/template_util_unittest.cc
similarity index 100%
rename from libweave/external/base/template_util_unittest.cc
rename to libweave/third_party/chromium/base/template_util_unittest.cc
diff --git a/libweave/external/base/third_party/dmg_fp/LICENSE b/libweave/third_party/chromium/base/third_party/dmg_fp/LICENSE
similarity index 100%
rename from libweave/external/base/third_party/dmg_fp/LICENSE
rename to libweave/third_party/chromium/base/third_party/dmg_fp/LICENSE
diff --git a/libweave/external/base/third_party/dmg_fp/README.chromium b/libweave/third_party/chromium/base/third_party/dmg_fp/README.chromium
similarity index 100%
rename from libweave/external/base/third_party/dmg_fp/README.chromium
rename to libweave/third_party/chromium/base/third_party/dmg_fp/README.chromium
diff --git a/libweave/external/base/third_party/dmg_fp/dmg_fp.h b/libweave/third_party/chromium/base/third_party/dmg_fp/dmg_fp.h
similarity index 100%
rename from libweave/external/base/third_party/dmg_fp/dmg_fp.h
rename to libweave/third_party/chromium/base/third_party/dmg_fp/dmg_fp.h
diff --git a/libweave/external/base/third_party/dmg_fp/dtoa.cc b/libweave/third_party/chromium/base/third_party/dmg_fp/dtoa.cc
similarity index 100%
rename from libweave/external/base/third_party/dmg_fp/dtoa.cc
rename to libweave/third_party/chromium/base/third_party/dmg_fp/dtoa.cc
diff --git a/libweave/external/base/third_party/dmg_fp/dtoa_wrapper.cc b/libweave/third_party/chromium/base/third_party/dmg_fp/dtoa_wrapper.cc
similarity index 100%
rename from libweave/external/base/third_party/dmg_fp/dtoa_wrapper.cc
rename to libweave/third_party/chromium/base/third_party/dmg_fp/dtoa_wrapper.cc
diff --git a/libweave/external/base/third_party/dmg_fp/g_fmt.cc b/libweave/third_party/chromium/base/third_party/dmg_fp/g_fmt.cc
similarity index 100%
rename from libweave/external/base/third_party/dmg_fp/g_fmt.cc
rename to libweave/third_party/chromium/base/third_party/dmg_fp/g_fmt.cc
diff --git a/libweave/external/base/third_party/icu/LICENSE b/libweave/third_party/chromium/base/third_party/icu/LICENSE
similarity index 100%
rename from libweave/external/base/third_party/icu/LICENSE
rename to libweave/third_party/chromium/base/third_party/icu/LICENSE
diff --git a/libweave/external/base/third_party/icu/README.chromium b/libweave/third_party/chromium/base/third_party/icu/README.chromium
similarity index 100%
rename from libweave/external/base/third_party/icu/README.chromium
rename to libweave/third_party/chromium/base/third_party/icu/README.chromium
diff --git a/libweave/external/base/third_party/icu/icu_utf.cc b/libweave/third_party/chromium/base/third_party/icu/icu_utf.cc
similarity index 100%
rename from libweave/external/base/third_party/icu/icu_utf.cc
rename to libweave/third_party/chromium/base/third_party/icu/icu_utf.cc
diff --git a/libweave/external/base/third_party/icu/icu_utf.h b/libweave/third_party/chromium/base/third_party/icu/icu_utf.h
similarity index 100%
rename from libweave/external/base/third_party/icu/icu_utf.h
rename to libweave/third_party/chromium/base/third_party/icu/icu_utf.h
diff --git a/libweave/external/base/time/clock.cc b/libweave/third_party/chromium/base/time/clock.cc
similarity index 100%
rename from libweave/external/base/time/clock.cc
rename to libweave/third_party/chromium/base/time/clock.cc
diff --git a/libweave/external/base/time/clock.h b/libweave/third_party/chromium/base/time/clock.h
similarity index 100%
rename from libweave/external/base/time/clock.h
rename to libweave/third_party/chromium/base/time/clock.h
diff --git a/libweave/external/base/time/default_clock.cc b/libweave/third_party/chromium/base/time/default_clock.cc
similarity index 100%
rename from libweave/external/base/time/default_clock.cc
rename to libweave/third_party/chromium/base/time/default_clock.cc
diff --git a/libweave/external/base/time/default_clock.h b/libweave/third_party/chromium/base/time/default_clock.h
similarity index 100%
rename from libweave/external/base/time/default_clock.h
rename to libweave/third_party/chromium/base/time/default_clock.h
diff --git a/libweave/external/base/time/time.cc b/libweave/third_party/chromium/base/time/time.cc
similarity index 100%
rename from libweave/external/base/time/time.cc
rename to libweave/third_party/chromium/base/time/time.cc
diff --git a/libweave/external/base/time/time.h b/libweave/third_party/chromium/base/time/time.h
similarity index 100%
rename from libweave/external/base/time/time.h
rename to libweave/third_party/chromium/base/time/time.h
diff --git a/libweave/external/base/time/time_posix.cc b/libweave/third_party/chromium/base/time/time_posix.cc
similarity index 100%
rename from libweave/external/base/time/time_posix.cc
rename to libweave/third_party/chromium/base/time/time_posix.cc
diff --git a/libweave/external/base/time/time_unittest.cc b/libweave/third_party/chromium/base/time/time_unittest.cc
similarity index 100%
rename from libweave/external/base/time/time_unittest.cc
rename to libweave/third_party/chromium/base/time/time_unittest.cc
diff --git a/libweave/external/base/tuple.h b/libweave/third_party/chromium/base/tuple.h
similarity index 100%
rename from libweave/external/base/tuple.h
rename to libweave/third_party/chromium/base/tuple.h
diff --git a/libweave/external/base/tuple_unittest.cc b/libweave/third_party/chromium/base/tuple_unittest.cc
similarity index 100%
rename from libweave/external/base/tuple_unittest.cc
rename to libweave/third_party/chromium/base/tuple_unittest.cc
diff --git a/libweave/external/base/values.cc b/libweave/third_party/chromium/base/values.cc
similarity index 100%
rename from libweave/external/base/values.cc
rename to libweave/third_party/chromium/base/values.cc
diff --git a/libweave/external/base/values.h b/libweave/third_party/chromium/base/values.h
similarity index 100%
rename from libweave/external/base/values.h
rename to libweave/third_party/chromium/base/values.h
diff --git a/libweave/external/base/values_unittest.cc b/libweave/third_party/chromium/base/values_unittest.cc
similarity index 100%
rename from libweave/external/base/values_unittest.cc
rename to libweave/third_party/chromium/base/values_unittest.cc
diff --git a/libweave/external/crypto/p224.cc b/libweave/third_party/chromium/crypto/p224.cc
similarity index 99%
rename from libweave/external/crypto/p224.cc
rename to libweave/third_party/chromium/crypto/p224.cc
index 8ec4034..81bce3a 100644
--- a/libweave/external/crypto/p224.cc
+++ b/libweave/third_party/chromium/crypto/p224.cc
@@ -7,11 +7,10 @@
 //
 // See http://www.imperialviolet.org/2010/12/04/ecc.html ([1]) for background.
 
-#include "external/crypto/p224.h"
+#include "third_party/chromium/crypto/p224.h"
 
 #include <string.h>
 
-namespace weave {
 namespace crypto {
 namespace p224 {
 
@@ -767,4 +766,3 @@
 
 }  // namespace p224
 }  // namespace crypto
-}  // namespace weave
diff --git a/libweave/external/crypto/p224.h b/libweave/third_party/chromium/crypto/p224.h
similarity index 90%
rename from libweave/external/crypto/p224.h
rename to libweave/third_party/chromium/crypto/p224.h
index ea15acf..7574389 100644
--- a/libweave/external/crypto/p224.h
+++ b/libweave/third_party/chromium/crypto/p224.h
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef LIBWEAVE_EXTERNAL_CRYPTO_P224_H_
-#define LIBWEAVE_EXTERNAL_CRYPTO_P224_H_
+#ifndef LIBWEAVE_THIRD_PARTY_CHROMIUM_P224_H_
+#define LIBWEAVE_THIRD_PARTY_CHROMIUM_P224_H_
 
 #include <string>
 
 #include <base/basictypes.h>
 
-namespace weave {
 namespace crypto {
 
 // P224 implements an elliptic curve group, commonly known as P224 and defined
@@ -54,6 +53,5 @@
 
 }  // namespace p224
 }  // namespace crypto
-}  // namespace weave
 
-#endif  // LIBWEAVE_EXTERNAL_CRYPTO_P224_H_
+#endif  // LIBWEAVE_THIRD_PARTY_CHROMIUM_P224_H_
diff --git a/libweave/external/crypto/p224_spake.cc b/libweave/third_party/chromium/crypto/p224_spake.cc
similarity index 98%
rename from libweave/external/crypto/p224_spake.cc
rename to libweave/third_party/chromium/crypto/p224_spake.cc
index 1db768e..6d82322 100644
--- a/libweave/external/crypto/p224_spake.cc
+++ b/libweave/third_party/chromium/crypto/p224_spake.cc
@@ -5,16 +5,15 @@
 // This code implements SPAKE2, a variant of EKE:
 //  http://www.di.ens.fr/~pointche/pub.php?reference=AbPo04
 
-#include "external/crypto/p224_spake.h"
+#include "third_party/chromium/crypto/p224_spake.h"
 
 #include <algorithm>
 
 #include <base/logging.h>
 #include <base/rand_util.h>
 
-#include "external/crypto/p224.h"
+#include "third_party/chromium/crypto/p224.h"
 
-namespace weave {
 namespace crypto {
 
 namespace {
@@ -283,4 +282,3 @@
 }
 
 }  // namespace crypto
-}  // namespace weave
diff --git a/libweave/external/crypto/p224_spake.h b/libweave/third_party/chromium/crypto/p224_spake.h
similarity index 94%
rename from libweave/external/crypto/p224_spake.h
rename to libweave/third_party/chromium/crypto/p224_spake.h
index 14bde6d..dcfd0fe 100644
--- a/libweave/external/crypto/p224_spake.h
+++ b/libweave/third_party/chromium/crypto/p224_spake.h
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef LIBWEAVE_EXTERNAL_CRYPTO_P224_SPAKE_H_
-#define LIBWEAVE_EXTERNAL_CRYPTO_P224_SPAKE_H_
+#ifndef LIBWEAVE_THIRD_PARTY_CHROMIUM_P224_SPAKE_H_
 
 #include <string>
 
 #include <base/gtest_prod_util.h>
 
-#include "external/crypto/p224.h"
-#include "external/crypto/sha2.h"
+#include "third_party/chromium/crypto/p224.h"
+#include "third_party/chromium/crypto/sha2.h"
 
-namespace weave {
 namespace crypto {
 
 // P224EncryptedKeyExchange implements SPAKE2, a variant of Encrypted
@@ -124,6 +122,5 @@
 };
 
 }  // namespace crypto
-}  // namespace weave
 
-#endif  // LIBWEAVE_EXTERNAL_CRYPTO_P224_SPAKE_H_
+#endif  // LIBWEAVE_THIRD_PARTY_CHROMIUM_P224_SPAKE_H_
diff --git a/libweave/external/crypto/p224_spake_unittest.cc b/libweave/third_party/chromium/crypto/p224_spake_unittest.cc
similarity index 98%
rename from libweave/external/crypto/p224_spake_unittest.cc
rename to libweave/third_party/chromium/crypto/p224_spake_unittest.cc
index 21cda88..9a9f9d2 100644
--- a/libweave/external/crypto/p224_spake_unittest.cc
+++ b/libweave/third_party/chromium/crypto/p224_spake_unittest.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 "external/crypto/p224_spake.h"
+#include "third_party/chromium/crypto/p224_spake.h"
 
 #include <string>
 
@@ -10,7 +10,6 @@
 #include <base/strings/string_number_conversions.h>
 #include <gtest/gtest.h>
 
-namespace weave {
 namespace crypto {
 
 namespace {
@@ -173,4 +172,3 @@
 }
 
 }  // namespace crypto
-}  // namespace weave
diff --git a/libweave/external/crypto/p224_unittest.cc b/libweave/third_party/chromium/crypto/p224_unittest.cc
similarity index 99%
rename from libweave/external/crypto/p224_unittest.cc
rename to libweave/third_party/chromium/crypto/p224_unittest.cc
index 6bfda46..0540dbb 100644
--- a/libweave/external/crypto/p224_unittest.cc
+++ b/libweave/third_party/chromium/crypto/p224_unittest.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "third_party/chromium/crypto/p224.h"
+
 #include <stdio.h>
 #include <string.h>
 
 #include <gtest/gtest.h>
 
-#include "external/crypto/p224.h"
-
-namespace weave {
 namespace crypto {
 
 using p224::Point;
@@ -823,4 +822,3 @@
 }
 
 }  // namespace crypto
-}  // namespace weave
diff --git a/libweave/external/crypto/sha2.cc b/libweave/third_party/chromium/crypto/sha2.cc
similarity index 91%
rename from libweave/external/crypto/sha2.cc
rename to libweave/third_party/chromium/crypto/sha2.cc
index 4ad40ba..7dcef0b 100644
--- a/libweave/external/crypto/sha2.cc
+++ b/libweave/third_party/chromium/crypto/sha2.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "external/crypto/sha2.h"
+#include "third_party/chromium/crypto/sha2.h"
 
 #include <algorithm>
 #include <openssl/sha.h>
 
 #include <base/memory/scoped_ptr.h>
 
-namespace weave {
 namespace crypto {
 
 void SHA256HashString(const std::string& str, uint8_t* output, size_t len) {
@@ -29,4 +28,3 @@
 }
 
 }  // namespace crypto
-}  // namespace weave
diff --git a/libweave/external/crypto/sha2.h b/libweave/third_party/chromium/crypto/sha2.h
similarity index 83%
rename from libweave/external/crypto/sha2.h
rename to libweave/third_party/chromium/crypto/sha2.h
index 920a798..8e05388 100644
--- a/libweave/external/crypto/sha2.h
+++ b/libweave/third_party/chromium/crypto/sha2.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef LIBWEAVE_EXTERNAL_CRYPTO_SHA2_H_
-#define LIBWEAVE_EXTERNAL_CRYPTO_SHA2_H_
+#ifndef LIBWEAVE_THIRD_PARTY_CHROMIUM_SHA2_H_
+#define LIBWEAVE_THIRD_PARTY_CHROMIUM_SHA2_H_
 
 #include <string>
 
-namespace weave {
 namespace crypto {
 
 // These functions perform SHA-256 operations.
@@ -26,6 +25,5 @@
 std::string SHA256HashString(const std::string& str);
 
 }  // namespace crypto
-}  // namespace weave
 
-#endif  // LIBWEAVE_EXTERNAL_CRYPTO_SHA2_H_
+#endif  // LIBWEAVE_THIRD_PARTY_CHROMIUM_SHA2_H_
diff --git a/libweave/external/crypto/sha2_unittest.cc b/libweave/third_party/chromium/crypto/sha2_unittest.cc
similarity index 98%
rename from libweave/external/crypto/sha2_unittest.cc
rename to libweave/third_party/chromium/crypto/sha2_unittest.cc
index cd89043..0c30f45 100644
--- a/libweave/external/crypto/sha2_unittest.cc
+++ b/libweave/third_party/chromium/crypto/sha2_unittest.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 "external/crypto/sha2.h"
+#include "third_party/chromium/crypto/sha2.h"
 
 #include <base/basictypes.h>
 #include <gtest/gtest.h>