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 3b94945034cc2665a53b3dc167709ed2e773c5c0..b90ab9124a64f4992985430ef06cf99c3f055736 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,6 +8,7 @@
 #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"
@@ -57,9 +58,20 @@ class DummyRouter : public browser_sync::LocalSessionEventRouter {
 };
 
 class WrenchMenuControllerTest
-    : public CocoaProfileTest,
-      public browser_sync::SessionsSyncManager::SyncInternalApiDelegate {
+    : public CocoaProfileTest {
  public:
+  WrenchMenuControllerTest()
+      : local_device_(new browser_sync::LocalDeviceInfoProviderMock(
+            "WrenchMenuControllerTest",
+            "Test Machine",
+            "Chromium 10k",
+            "Chrome 10k",
+            sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
+            "device_id")) {
+  }
+
+  virtual ~WrenchMenuControllerTest() {}
+
   virtual void SetUp() OVERRIDE {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
@@ -69,7 +81,7 @@ class WrenchMenuControllerTest
 
     manager_.reset(new browser_sync::SessionsSyncManager(
         profile(),
-        this,
+        local_device_.get(),
         scoped_ptr<browser_sync::LocalSessionEventRouter>(
             new DummyRouter())));
     manager_->MergeDataAndStartSyncing(
@@ -81,21 +93,6 @@ class WrenchMenuControllerTest
             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,
-                       "device_id"));
-  }
-
-  virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
-    return "WrenchMenuControllerTest";
-  }
-
   void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
     helper->ExportToSessionsSyncManager(manager_.get());
   }
@@ -121,6 +118,7 @@ class WrenchMenuControllerTest
 
  private:
   scoped_ptr<browser_sync::SessionsSyncManager> manager_;
+  scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_;
 };
 
 TEST_F(WrenchMenuControllerTest, Initialized) {