summaryrefslogtreecommitdiffstats
path: root/chromeos/network
diff options
context:
space:
mode:
authorsatorux <satorux@chromium.org>2014-12-11 17:32:36 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-12 01:33:45 +0000
commit612142321c115cc876e1d5306c22b35f1859ab74 (patch)
treec4a4944473d3d72c7b281559588dac4114db1b43 /chromeos/network
parent1b703ab9a57fe860a017163c0580641ae337cbab (diff)
downloadchromium_src-612142321c115cc876e1d5306c22b35f1859ab74.zip
chromium_src-612142321c115cc876e1d5306c22b35f1859ab74.tar.gz
chromium_src-612142321c115cc876e1d5306c22b35f1859ab74.tar.bz2
Move chromeos/tpm_* to chromeos/tpm
These files are moved in favor of less files to have in the top-level chromeos directory. BUG=none TEST=builds as before Review URL: https://codereview.chromium.org/738683002 Cr-Commit-Position: refs/heads/master@{#308020}
Diffstat (limited to 'chromeos/network')
-rw-r--r--chromeos/network/network_cert_migrator_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc
index a8c2342..02220d4 100644
--- a/chromeos/network/network_cert_migrator_unittest.cc
+++ b/chromeos/network/network_cert_migrator_unittest.cc
@@ -15,7 +15,7 @@
#include "chromeos/dbus/shill_profile_client.h"
#include "chromeos/dbus/shill_service_client.h"
#include "chromeos/network/network_state_handler.h"
-#include "chromeos/tpm_token_loader.h"
+#include "chromeos/tpm/tpm_token_loader.h"
#include "crypto/nss_util_internal.h"
#include "crypto/scoped_test_nss_chromeos_user.h"
#include "net/base/crypto_module.h"