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}

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -112,7 +112,7 @@
 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/system/statistics_provider.h"
-#include "chromeos/tpm_token_loader.h"
+#include "chromeos/tpm/tpm_token_loader.h"
 #include "components/metrics/metrics_service.h"
 #include "components/ownership/owner_key_util.h"
 #include "components/session_manager/core/session_manager.h"

chrome/browser/chromeos/login/screens/eula_screen.h

@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/screens/base_screen.h"
 #include "chrome/browser/chromeos/login/screens/eula_model.h"
-#include "chromeos/tpm_password_fetcher.h"
+#include "chromeos/tpm/tpm_password_fetcher.h"
 #include "components/login/screens/screen_context.h"
 #include "url/gurl.h"
 

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

@@ -20,7 +20,7 @@
 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/tpm_token_loader.h"
+#include "chromeos/tpm/tpm_token_loader.h"
 #include "components/ownership/owner_key_util.h"
 #include "components/user_manager/user.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/profiles/profile_io_data.cc

@@ -132,7 +132,7 @@
 #include "chrome/browser/net/nss_context.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/settings/cros_settings_names.h"
-#include "chromeos/tpm_token_info_getter.h"
+#include "chromeos/tpm/tpm_token_info_getter.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "crypto/nss_util.h"

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h

@@ -9,7 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/login/screens/eula_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
-#include "chromeos/tpm_password_fetcher.h"
+#include "chromeos/tpm/tpm_password_fetcher.h"
 #include "content/public/browser/web_ui.h"
 
 namespace base {

chromeos/chromeos.gyp

@@ -401,12 +401,12 @@
       'system/name_value_pairs_parser.h',
       'system/statistics_provider.cc',
       'system/statistics_provider.h',
-      'tpm_password_fetcher.cc',
-      'tpm_password_fetcher.h',
-      'tpm_token_info_getter.cc',
-      'tpm_token_info_getter.h',
-      'tpm_token_loader.cc',
-      'tpm_token_loader.h'
+      'tpm/tpm_password_fetcher.cc',
+      'tpm/tpm_password_fetcher.h',
+      'tpm/tpm_token_info_getter.cc',
+      'tpm/tpm_token_info_getter.h',
+      'tpm/tpm_token_loader.cc',
+      'tpm/tpm_token_loader.h'
     ],
     'chromeos_test_sources': [
       'app_mode/kiosk_oem_manifest_parser_unittest.cc',
@@ -465,7 +465,7 @@
       'process_proxy/process_output_watcher_unittest.cc',
       'process_proxy/process_proxy_unittest.cc',
       'system/name_value_pairs_parser_unittest.cc',
-      'tpm_token_info_getter_unittest.cc',
+      'tpm/tpm_token_info_getter_unittest.cc',
     ],
   },
   'includes': [

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"

chromeos/tpm_password_fetcher.h → chromeos/tpm/tpm_password_fetcher.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_TPM_PASSWORD_FETCHER_H_
-#define CHROMEOS_TPM_PASSWORD_FETCHER_H_
+#ifndef CHROMEOS_TPM_TPM_PASSWORD_FETCHER_H_
+#define CHROMEOS_TPM_TPM_PASSWORD_FETCHER_H_
 
 #include <string>
 
@@ -54,4 +54,4 @@ class CHROMEOS_EXPORT TpmPasswordFetcher {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_TPM_PASSWORD_FETCHER_H_
+#endif  // CHROMEOS_TPM_TPM_PASSWORD_FETCHER_H_

chromeos/tpm_token_info_getter.cc → chromeos/tpm/tpm_token_info_getter.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 "chromeos/tpm_token_info_getter.h"
+#include "chromeos/tpm/tpm_token_info_getter.h"
 
 #include "base/bind.h"
 #include "base/location.h"

chromeos/tpm_token_info_getter.h → chromeos/tpm/tpm_token_info_getter.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_TPM_TOKEN_INFO_GETTER_H_
-#define CHROMEOS_TPM_TOKEN_INFO_GETTER_H_
+#ifndef CHROMEOS_TPM_TPM_TOKEN_INFO_GETTER_H_
+#define CHROMEOS_TPM_TPM_TOKEN_INFO_GETTER_H_
 
 #include <string>
 
@@ -124,4 +124,4 @@ class CHROMEOS_EXPORT TPMTokenInfoGetter {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_TPM_TOKEN_INFO_GETTER_H_
+#endif  // CHROMEOS_TPM_TPM_TOKEN_INFO_GETTER_H_

chromeos/tpm_token_info_getter_unittest.cc → chromeos/tpm/tpm_token_info_getter_unittest.cc

@@ -14,7 +14,7 @@
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
-#include "chromeos/tpm_token_info_getter.h"
+#include "chromeos/tpm/tpm_token_info_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -522,4 +522,3 @@ TEST_F(UserTPMTokenInfoGetterTest, GetTpmTokenInfoInitiallyNotReady) {
 }
 
 }  // namespace
-

chromeos/tpm_token_loader.cc → chromeos/tpm/tpm_token_loader.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 "chromeos/tpm_token_loader.h"
+#include "chromeos/tpm/tpm_token_loader.h"
 
 #include <algorithm>
 
@@ -14,7 +14,7 @@
 #include "base/task_runner_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/tpm_token_info_getter.h"
+#include "chromeos/tpm/tpm_token_info_getter.h"
 #include "crypto/nss_util.h"
 
 namespace chromeos {

chromeos/tpm_token_loader.h → chromeos/tpm/tpm_token_loader.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_TPM_TOKEN_LOADER_H_
-#define CHROMEOS_TPM_TOKEN_LOADER_H_
+#ifndef CHROMEOS_TPM_TPM_TOKEN_LOADER_H_
+#define CHROMEOS_TPM_TPM_TOKEN_LOADER_H_
 
 #include <string>
 #include <vector>
@@ -128,4 +128,4 @@ class CHROMEOS_EXPORT TPMTokenLoader : public LoginState::Observer {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_TPM_TOKEN_LOADER_H_
+#endif  // CHROMEOS_TPM_TPM_TOKEN_LOADER_H_