chromeos: Move src/chrome/browser/chromeos/cryptohome to src/chromeos

BUG=None
TEST=build

TBR=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10878061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153410 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
@@ -71,6 +70,7 @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"

chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -13,7 +13,6 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
-#include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
@@ -31,6 +30,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
+#include "chromeos/cryptohome/mock_async_method_caller.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "chromeos/dbus/mock_session_manager_client.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/login/parallel_authenticator.cc

@@ -15,7 +15,6 @@
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -24,6 +23,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_auth_util.h"
+#include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"

chrome/browser/chromeos/login/parallel_authenticator_unittest.cc

@@ -15,7 +15,6 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_cert_library.h"
 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
-#include "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
 #include "chrome/browser/chromeos/login/mock_login_status_consumer.h"
 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
 #include "chrome/browser/chromeos/login/mock_user_manager.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chromeos/cryptohome/mock_async_method_caller.h"
 #include "chromeos/dbus/mock_cryptohome_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "content/public/test/test_browser_thread.h"

chrome/browser/chromeos/login/user_manager_impl.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ -49,6 +48,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
+#include "chromeos/cryptohome/async_method_caller.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_constants.h"

chrome/chrome_browser.gypi

@@ -531,8 +531,6 @@
         'browser/chromeos/cros/onc_network_parser.h',
         'browser/chromeos/cros/sms_watcher.cc',
         'browser/chromeos/cros/sms_watcher.h',
-        'browser/chromeos/cryptohome/async_method_caller.cc',
-        'browser/chromeos/cryptohome/async_method_caller.h',
         'browser/chromeos/customization_document.cc',
         'browser/chromeos/customization_document.h',
         'browser/chromeos/dbus/cros_dbus_service.cc',

chrome/chrome_tests.gypi

@@ -95,8 +95,6 @@
         'browser/chromeos/cros/mock_cryptohome_library.h',
         'browser/chromeos/cros/mock_network_library.cc',
         'browser/chromeos/cros/mock_network_library.h',
-        'browser/chromeos/cryptohome/mock_async_method_caller.cc',
-        'browser/chromeos/cryptohome/mock_async_method_caller.h',
         'browser/chromeos/input_method/mock_candidate_window.cc',
         'browser/chromeos/input_method/mock_candidate_window.h',
         'browser/chromeos/input_method/mock_input_method_manager.cc',

chromeos/chromeos.gyp

@@ -26,6 +26,8 @@
         'chromeos_export.h',
         'chromeos_switches.cc',
         'chromeos_switches.h',
+        'cryptohome/async_method_caller.cc',
+        'cryptohome/async_method_caller.h',
         'dbus/blocking_method_caller.cc',
         'dbus/blocking_method_caller.h',
         'dbus/bluetooth_adapter_client.cc',
@@ -134,6 +136,8 @@
         'chromeos',
       ],
       'sources': [
+        'cryptohome/mock_async_method_caller.cc',
+        'cryptohome/mock_async_method_caller.h',
         'dbus/mock_bluetooth_adapter_client.cc',
         'dbus/mock_bluetooth_adapter_client.h',
         'dbus/mock_bluetooth_device_client.cc',

chrome/browser/chromeos/cryptohome/async_method_caller.cc → chromeos/cryptohome/async_method_caller.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 "chrome/browser/chromeos/cryptohome/async_method_caller.h"
+#include "chromeos/cryptohome/async_method_caller.h"
 
 #include "base/bind.h"
 #include "base/hash_tables.h"

chrome/browser/chromeos/cryptohome/async_method_caller.h → chromeos/cryptohome/async_method_caller.h

@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
-#define CHROME_BROWSER_CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
+#ifndef CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
+#define CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
 
 #include <string>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
+#include "chromeos/chromeos_export.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace cryptohome {
@@ -17,7 +18,7 @@ namespace cryptohome {
 // since there is already a namespace ::cryptohome which holds the error code
 // enum (MountError) and referencing ::chromeos::cryptohome and ::cryptohome
 // within the same code is confusing.
-class AsyncMethodCaller {
+class CHROMEOS_EXPORT AsyncMethodCaller {
  public:
   // A callback type which is called back on the UI thread when the results of
   // method calls are ready.
@@ -83,4 +84,4 @@ class AsyncMethodCaller {
 
 }  // namespace cryptohome
 
-#endif  // CHROME_BROWSER_CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
+#endif  // CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_

chrome/browser/chromeos/cryptohome/mock_async_method_caller.cc → chromeos/cryptohome/mock_async_method_caller.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 "chrome/browser/chromeos/cryptohome/mock_async_method_caller.h"
+#include "chromeos/cryptohome/mock_async_method_caller.h"
 
 using ::testing::Invoke;
 using ::testing::WithArgs;
@@ -40,5 +40,4 @@ void MockAsyncMethodCaller::DoCallback(Callback callback) {
   callback.Run(success_, return_code_);
 }
 
-
 }  // namespace cryptohome

chrome/browser/chromeos/cryptohome/mock_async_method_caller.h → chromeos/cryptohome/mock_async_method_caller.h

@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
-#define CHROME_BROWSER_CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
+#ifndef CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
+#define CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
+#include "base/callback.h"
+#include "chromeos/cryptohome/async_method_caller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace cryptohome {
@@ -46,4 +47,4 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
 
 }  // namespace cryptohome
 
-#endif  // CHROME_BROWSER_CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
+#endif  // CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_