diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 01:34:54 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 01:34:54 +0000 |
| commit | c523d20e1db8fb7fc003686f336b958605e8a58f (patch) | |
| tree | 6995a795f122aa0abc6d71befb21149ed9232877 /google_apis/gcm | |
| parent | 77d2fa7ea388573238e8503ecbfa50974a5372f2 (diff) | |
| download | chromium_src-c523d20e1db8fb7fc003686f336b958605e8a58f.zip chromium_src-c523d20e1db8fb7fc003686f336b958605e8a58f.tar.gz chromium_src-c523d20e1db8fb7fc003686f336b958605e8a58f.tar.bz2 | |
components: Rename encryptor directory to os_crypt.
Joi suggested doing this rename in a follow up CL (
https://codereview.chromium.org/183953005/diff/20001/components/encryptor/encryptor_password_mac.h#newcode16).
So here it is.
BUG=341293
TEST=None, no functional changes.
R=joi@chromium.org,thestig@chromium.org,bcwhite@chromium.org
Review URL: https://codereview.chromium.org/200713005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gcm')
| -rw-r--r-- | google_apis/gcm/DEPS | 2 | ||||
| -rw-r--r-- | google_apis/gcm/engine/gcm_store_impl.cc | 2 | ||||
| -rw-r--r-- | google_apis/gcm/engine/mcs_client_unittest.cc | 2 | ||||
| -rw-r--r-- | google_apis/gcm/gcm.gyp | 4 | ||||
| -rw-r--r-- | google_apis/gcm/gcm_client_impl_unittest.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/google_apis/gcm/DEPS b/google_apis/gcm/DEPS index db06c39..5accad6 100644 --- a/google_apis/gcm/DEPS +++ b/google_apis/gcm/DEPS @@ -7,7 +7,7 @@ include_rules = [ "+base", "+testing", - "+components/encryptor", + "+components/os_crypt", "+google", # For third_party/protobuf/src. "+net", "+third_party/leveldatabase", diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc index 91d3e70..100cd57 100644 --- a/google_apis/gcm/engine/gcm_store_impl.cc +++ b/google_apis/gcm/engine/gcm_store_impl.cc @@ -17,7 +17,7 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/tracked_objects.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include "google_apis/gcm/base/mcs_message.h" #include "google_apis/gcm/base/mcs_util.h" #include "google_apis/gcm/protocol/mcs.pb.h" diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc index c4ab792..5983ddd 100644 --- a/google_apis/gcm/engine/mcs_client_unittest.cc +++ b/google_apis/gcm/engine/mcs_client_unittest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/simple_test_clock.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include "google_apis/gcm/base/mcs_util.h" #include "google_apis/gcm/engine/fake_connection_factory.h" #include "google_apis/gcm/engine/fake_connection_handler.h" diff --git a/google_apis/gcm/gcm.gyp b/google_apis/gcm/gcm.gyp index 75d2715..c5dfa6dd 100644 --- a/google_apis/gcm/gcm.gyp +++ b/google_apis/gcm/gcm.gyp @@ -31,7 +31,7 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '../../components/components.gyp:encryptor', + '../../components/components.gyp:os_crypt', '../../net/net.gyp:net', '../../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../../third_party/protobuf/protobuf.gyp:protobuf_lite', @@ -113,7 +113,7 @@ 'dependencies': [ '../../base/base.gyp:run_all_unittests', '../../base/base.gyp:base', - '../../components/components.gyp:encryptor', + '../../components/components.gyp:os_crypt', '../../net/net.gyp:net', '../../net/net.gyp:net_test_support', '../../testing/gtest.gyp:gtest', diff --git a/google_apis/gcm/gcm_client_impl_unittest.cc b/google_apis/gcm/gcm_client_impl_unittest.cc index 7320c00..b59023e 100644 --- a/google_apis/gcm/gcm_client_impl_unittest.cc +++ b/google_apis/gcm/gcm_client_impl_unittest.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/test/simple_test_clock.h" -#include "components/encryptor/os_crypt.h" +#include "components/os_crypt/os_crypt.h" #include "google_apis/gcm/base/mcs_message.h" #include "google_apis/gcm/base/mcs_util.h" #include "google_apis/gcm/engine/fake_connection_factory.h" |