Revert of Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index 65a6aebf51858f5ee6ac8baca1baef22b93d1700..774b5597c7ca28cd4efcd36a9937a57572073685 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -8,7 +8,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sync/glue/device_info.h"
-#include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ -58,19 +57,9 @@
 };
 
 class WrenchMenuControllerTest
-    : public CocoaProfileTest {
+    : public CocoaProfileTest,
+      public browser_sync::SessionsSyncManager::SyncInternalApiDelegate {
  public:
-  WrenchMenuControllerTest()
-      : local_device_(new browser_sync::LocalDeviceInfoProviderMock(
-            "WrenchMenuControllerTest",
-            "Test Machine",
-            "Chromium 10k",
-            "Chrome 10k",
-            sync_pb::SyncEnums_DeviceType_TYPE_LINUX)) {
-  }
-
-  virtual ~WrenchMenuControllerTest() {}
-
   virtual void SetUp() OVERRIDE {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
@@ -80,7 +69,7 @@
 
     manager_.reset(new browser_sync::SessionsSyncManager(
         profile(),
-        local_device_.get(),
+        this,
         scoped_ptr<browser_sync::LocalSessionEventRouter>(
             new DummyRouter())));
     manager_->MergeDataAndStartSyncing(
@@ -92,6 +81,20 @@
             new syncer::SyncErrorFactoryMock));
   }
 
+  virtual scoped_ptr<browser_sync::DeviceInfo> GetLocalDeviceInfo()
+      const OVERRIDE {
+    return scoped_ptr<browser_sync::DeviceInfo>(
+        new browser_sync::DeviceInfo(GetLocalSyncCacheGUID(),
+                       "Test Machine",
+                       "Chromium 10k",
+                       "Chrome 10k",
+                       sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
+  }
+
+  virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
+    return "WrenchMenuControllerTest";
+  }
+
   void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
     helper->ExportToSessionsSyncManager(manager_.get());
   }
@@ -117,7 +120,6 @@
 
  private:
   scoped_ptr<browser_sync::SessionsSyncManager> manager_;
-  scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_;
 };
 
 TEST_F(WrenchMenuControllerTest, Initialized) {