Revert 284234 "Pass signin_scoped_device_id to DeviceInfoSpecifics."

trunk/src/chrome/browser/extensions/api/sessions/sessions_apitest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/sessions/sessions_api.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
@@ skipping 130 matching lines @@
   EXPECT_CALL(*service, GetAuthError()).WillRepeatedly(
       testing::ReturnRef(no_error));
   ON_CALL(*service, GetActiveDataTypes()).WillByDefault(
       testing::Return(preferred_types));
   ON_CALL(*service, GetLocalDeviceInfoMock()).WillByDefault(
       testing::Return(new browser_sync::DeviceInfo(
           std::string(kSessionTags[0]),
           "machine name",
           "Chromium 10k",
           "Chrome 10k",
-          sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-          "device_id")));
+          sync_pb::SyncEnums_DeviceType_TYPE_LINUX)));
   ON_CALL(*service, GetLocalSyncCacheGUID()).WillByDefault(
       testing::Return(std::string(kSessionTags[0])));
   EXPECT_CALL(*service, AddObserver(testing::_)).Times(testing::AnyNumber());
   EXPECT_CALL(*service, RemoveObserver(testing::_)).Times(testing::AnyNumber());
 
   service->Initialize();
 }
 
 void ExtensionSessionsTest::CreateTestExtension() {
   scoped_ptr<base::DictionaryValue> test_extension_value(
@@ skipping 180 matching lines @@
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   ASSERT_TRUE(RunExtensionSubtest("sessions",
                                   "sessions.html")) << message_;
 }
 
 }  // namespace extensions