Revert 152609 - Integrate invalidation API into ChromeToMobileService.

chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.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.
 
 #import "chrome/browser/ui/cocoa/chrome_to_mobile_bubble_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
@@ skipping 147 matching lines @@
   [sendCopy_ setTitle:sendCopyString];
   [sendCopy_ setState:NSOffState];
 
   // Observe Chrome and ChromeToMobileService changes.
   bridge_.reset(new ChromeToMobileBubbleNotificationBridge(
       self, @selector(cancel:)));
 
   // Generate the MHTML snapshot now to report its size in the bubble.
   service_->GenerateSnapshot(browser_, bridge_->AsWeakPtr());
 
+  // Request a mobile device list update.
+  service_->RequestMobileListUpdate();
+
   [super showWindow:sender];
 }
 
 - (IBAction)learn:(id)sender {
   service_->LearnMore(browser_);
   [self close];
 }
 
 - (IBAction)send:(id)sender {
   // TODO(msw): Handle updates to the mobile list while the bubble is open.
   const ListValue* mobiles = service_->GetMobiles();
   // |mobileRadioGroup_| has a single row by defualt, so these always match.
   DCHECK_EQ(static_cast<NSInteger>(mobiles->GetSize()),
             [mobileRadioGroup_ numberOfRows]);
   // NSMatrix selectedRow is -1 by default (in the single mobile device case).
   const int selected_index = std::max<int>([mobileRadioGroup_ selectedRow], 0);
 
   const DictionaryValue* mobile = NULL;
   if (mobiles->GetDictionary(selected_index, &mobile)) {
-    service_->SendToMobile(mobile,
+    service_->SendToMobile(*mobile,
         ([sendCopy_ state] == NSOnState) ? snapshotPath_ : FilePath(),
         browser_, bridge_->AsWeakPtr());
   } else {
     NOTREACHED();
   }
 
   // Update the bubble's contents to show the "Sending..." progress animation.
   [cancel_ setEnabled:NO];
   [send_ setEnabled:NO];
   [send_ setAlignment:NSNaturalTextAlignment];
@@ skipping 86 matching lines @@
 
 - (void)setSendCopy:(bool)sendCopy {
   [sendCopy_ setState:(sendCopy ? NSOnState : NSOffState)];
 }
 
 - (ChromeToMobileBubbleNotificationBridge*)bridge {
   return bridge_.get();
 }
 
 @end  // ChromeToMobileBubbleController (JustForTesting)