Index: components/sync/base/get_session_name.cc |
diff --git a/sync/util/get_session_name.cc b/components/sync/base/get_session_name.cc |
similarity index 86% |
rename from sync/util/get_session_name.cc |
rename to components/sync/base/get_session_name.cc |
index 1d4ba42988b0776d19ffd3d7651279bef3d8bb0a..1d3aebdcbb05861548c36c960b367b7ca05771e6 100644 |
--- a/sync/util/get_session_name.cc |
+++ b/components/sync/base/get_session_name.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 "sync/util/get_session_name.h" |
+#include "components/sync/base/get_session_name.h" |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
@@ -16,13 +16,13 @@ |
#if defined(OS_CHROMEOS) |
#include "chromeos/system/devicetype.h" |
#elif defined(OS_LINUX) |
-#include "sync/util/get_session_name_linux.h" |
+#include "components/sync/base/get_session_name_linux.h" |
#elif defined(OS_IOS) |
-#include "sync/util/get_session_name_ios.h" |
+#include "components/sync/base/get_session_name_ios.h" |
#elif defined(OS_MACOSX) |
-#include "sync/util/get_session_name_mac.h" |
+#include "components/sync/base/get_session_name_mac.h" |
#elif defined(OS_WIN) |
-#include "sync/util/get_session_name_win.h" |
+#include "components/sync/base/get_session_name_win.h" |
#elif defined(OS_ANDROID) |
#include "base/android/build_info.h" |
#endif |
@@ -89,11 +89,8 @@ void GetSessionName( |
const base::Callback<void(const std::string&)>& done_callback) { |
std::string* session_name = new std::string(); |
task_runner->PostTaskAndReply( |
- FROM_HERE, |
- base::Bind(&FillSessionName, |
- base::Unretained(session_name)), |
- base::Bind(&OnSessionNameFilled, |
- done_callback, |
+ FROM_HERE, base::Bind(&FillSessionName, base::Unretained(session_name)), |
+ base::Bind(&OnSessionNameFilled, done_callback, |
base::Owned(session_name))); |
} |