[Sync] Simplify GetSessionName interface

chrome/browser/sync/util/get_session_name_unittest.cc

Index: chrome/browser/sync/util/get_session_name_unittest.cc
diff --git a/chrome/browser/sync/util/get_session_name_task_unittest.cc b/chrome/browser/sync/util/get_session_name_unittest.cc
similarity index 78%
rename from chrome/browser/sync/util/get_session_name_task_unittest.cc
rename to chrome/browser/sync/util/get_session_name_unittest.cc
index 97f6dfe1fd0be6c82e88e85068db76b2a0da5728..056ff1963e5adde054648a259474aaa2b1814f44 100644
--- a/chrome/browser/sync/util/get_session_name_task_unittest.cc
+++ b/chrome/browser/sync/util/get_session_name_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <string>
 
-#include "chrome/browser/sync/util/get_session_name_task.h"
+#include "chrome/browser/sync/util/get_session_name.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
@@ -14,7 +14,7 @@ typedef testing::Test SyncGetSessionNameTaskTest;
 #if defined(OS_WIN)
 // The test is somewhat silly, and just verifies that we return a computer name.
 TEST_F(SyncGetSessionNameTaskTest, GetComputerName) {
-  std::string computer_name = GetSessionNameTask::GetComputerName();
+  std::string computer_name = internal::GetComputerName();
   EXPECT_TRUE(!computer_name.empty());
 }
 #endif
@@ -23,7 +23,7 @@ TEST_F(SyncGetSessionNameTaskTest, GetComputerName) {
 // The test is somewhat silly, and just verifies that we return a hardware
 // model name.
 TEST_F(SyncGetSessionNameTaskTest, GetHardwareModelName) {
-  std::string hardware_model = GetSessionNameTask::GetHardwareModelName();
+  std::string hardware_model = internal::GetHardwareModelName();
   EXPECT_TRUE(!hardware_model.empty());
 }
 #endif