Revert 152609 - Integrate invalidation API into ChromeToMobileService.

chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller_unittest.mm

 // Copyright (c) 2012 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 "base/values.h"
 #include "chrome/browser/chrome_to_mobile_service.h"
 #import "chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 // Caution!!! Do not conflict with this class name elsewhere!
 class MockChromeToMobileService : public ChromeToMobileService {
  public:
   MockChromeToMobileService() : ChromeToMobileService(NULL) {}
 
   // A utility function to add mock devices.
   void AddDevices(size_t count);
 
   // ChromeToMobileService overrides:
   virtual const base::ListValue* GetMobiles() const OVERRIDE;
 
+  MOCK_METHOD0(RequestMobileListUpdate, void());
   MOCK_METHOD2(GenerateSnapshot, void(Browser* browser,
                                       base::WeakPtr<Observer> observer));
-  MOCK_METHOD4(SendToMobile, void(const base::DictionaryValue* mobile,
+  MOCK_METHOD4(SendToMobile, void(const base::DictionaryValue& mobile,
                                   const FilePath& snapshot,
                                   Browser* browser,
                                   base::WeakPtr<Observer> observer));
   MOCK_METHOD1(DeleteSnapshot, void(const FilePath& snapshot));
   MOCK_CONST_METHOD1(LogMetric, void(ChromeToMobileService::Metric));
 
   // A set of mock mobile devices, kept in lieu of the list in profile prefs.
   base::ListValue mobiles_;
 };
 
 void MockChromeToMobileService::AddDevices(size_t count) {
   for(size_t i = 0; i < count; i++) {
     base::DictionaryValue* device = new base::DictionaryValue();
-    device->SetString("type", "Device Type");
     device->SetString("name", "Device Name");
-    device->SetString("id", "Device ID");
     mobiles_.Append(device);
   }
 }
 
 const base::ListValue* MockChromeToMobileService::GetMobiles() const {
   return &mobiles_;
 }
 
 namespace {
 
@@ skipping 58 matching lines @@
   MockChromeToMobileService service_;
   ChromeToMobileBubbleController* controller_;  // Weak, owns self.
 
  private:
   NSWindow* window_;  // Weak, owned by controller.
 
   DISALLOW_COPY_AND_ASSIGN(ChromeToMobileBubbleControllerTest);
 };
 
 TEST_F(ChromeToMobileBubbleControllerTest, OneDevice) {
+  EXPECT_CALL(service_, RequestMobileListUpdate());
   EXPECT_CALL(service_, GenerateSnapshot(NULL, testing::_));
-  EXPECT_CALL(service_, SendToMobile(testing::_, testing::_,
-                                     testing::_, testing::_)).Times(0);
   EXPECT_CALL(service_, DeleteSnapshot(testing::_));
   EXPECT_CALL(service_, LogMetric(ChromeToMobileService::BUBBLE_SHOWN));
 
   service_.AddDevices(1);
   CreateBubble();
   CheckWindow(/*radio_buttons=*/0);
 }
 
 TEST_F(ChromeToMobileBubbleControllerTest, TwoDevices) {
+  EXPECT_CALL(service_, RequestMobileListUpdate());
   EXPECT_CALL(service_, GenerateSnapshot(NULL, testing::_));
-  EXPECT_CALL(service_, SendToMobile(testing::_, testing::_,
-                                     testing::_, testing::_)).Times(0);
   EXPECT_CALL(service_, DeleteSnapshot(testing::_));
   EXPECT_CALL(service_, LogMetric(ChromeToMobileService::BUBBLE_SHOWN));
 
   service_.AddDevices(2);
   CreateBubble();
   CheckWindow(/*radio_buttons=*/2);
 }
 
 TEST_F(ChromeToMobileBubbleControllerTest, ThreeDevices) {
+  EXPECT_CALL(service_, RequestMobileListUpdate());
   EXPECT_CALL(service_, GenerateSnapshot(NULL, testing::_));
-  EXPECT_CALL(service_, SendToMobile(testing::_, testing::_,
-                                     testing::_, testing::_)).Times(0);
   EXPECT_CALL(service_, DeleteSnapshot(testing::_));
   EXPECT_CALL(service_, LogMetric(ChromeToMobileService::BUBBLE_SHOWN));
 
   service_.AddDevices(3);
   CreateBubble();
   CheckWindow(/*radio_buttons=*/3);
 }
 
 TEST_F(ChromeToMobileBubbleControllerTest, SendWithoutSnapshot) {
   FilePath path;
+  EXPECT_CALL(service_, RequestMobileListUpdate());
   EXPECT_CALL(service_, GenerateSnapshot(NULL, testing::_));
   EXPECT_CALL(service_, SendToMobile(testing::_, path, NULL, testing::_));
   EXPECT_CALL(service_, DeleteSnapshot(testing::_));
   EXPECT_CALL(service_, LogMetric(ChromeToMobileService::BUBBLE_SHOWN));
 
   service_.AddDevices(1);
   CreateBubble();
   [controller_ send:nil];
 }
 
 TEST_F(ChromeToMobileBubbleControllerTest, SendWithSnapshot) {
   FilePath path("path.mht");
+  EXPECT_CALL(service_, RequestMobileListUpdate());
   EXPECT_CALL(service_, GenerateSnapshot(NULL, testing::_));
   EXPECT_CALL(service_, SendToMobile(testing::_, path, NULL, testing::_));
   EXPECT_CALL(service_, DeleteSnapshot(testing::_));
   EXPECT_CALL(service_, LogMetric(ChromeToMobileService::BUBBLE_SHOWN));
   EXPECT_CALL(service_, LogMetric(ChromeToMobileService::SNAPSHOT_GENERATED));
 
   service_.AddDevices(1);
   CreateBubble();
   ChromeToMobileBubbleNotificationBridge* bridge = [controller_ bridge];
   bridge->SnapshotGenerated(path, 1);
   [controller_ setSendCopy:YES];
   [controller_ send:nil];
   // Send failure to prevent the bubble from posting a task to close itself.
   bridge->OnSendComplete(false);
 }
 
 }  // namespace