Revert 152609 - Integrate invalidation API into ChromeToMobileService.

chrome/browser/ui/views/chrome_to_mobile_bubble_view.cc

 // 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 "chrome/browser/ui/views/chrome_to_mobile_bubble_view.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
@@ skipping 311 matching lines @@
       browser_(browser),
       service_(ChromeToMobileServiceFactory::GetForProfile(browser->profile())),
       send_copy_(NULL),
       send_(NULL),
       cancel_(NULL) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_insets(gfx::Insets(5, 0, 5, 0));
 
   // Generate the MHTML snapshot now to report its size in the bubble.
   service_->GenerateSnapshot(browser_, weak_ptr_factory_.GetWeakPtr());
+
+  // Request a mobile device list update.
+  service_->RequestMobileListUpdate();
 }
 
 void ChromeToMobileBubbleView::LinkClicked(views::Link* source,
                                            int event_flags) {
   service_->LearnMore(browser_);
   GetWidget()->Close();
 }
 
 void ChromeToMobileBubbleView::HandleButtonPressed(views::Button* sender) {
   if (sender == send_)
@@ skipping 12 matching lines @@
       if (radio_buttons_[selected_index]->checked())
         break;
     }
   } else {
     DCHECK(radio_buttons_.empty());
   }
 
   const DictionaryValue* mobile = NULL;
   if (mobiles->GetDictionary(selected_index, &mobile)) {
     FilePath snapshot = send_copy_->checked() ? snapshot_path_ : FilePath();
-    service_->SendToMobile(mobile, snapshot, browser_,
+    service_->SendToMobile(*mobile, snapshot, browser_,
                            weak_ptr_factory_.GetWeakPtr());
   } else {
     NOTREACHED();
   }
 
   // Update the view's contents to show the "Sending..." progress animation.
   cancel_->SetEnabled(false);
   send_->SetEnabled(false);
   send_->set_alignment(views::TextButtonBase::ALIGN_LEFT);
   progress_animation_.reset(new ui::ThrobAnimation(this));
   progress_animation_->SetDuration(kProgressThrobDurationMS);
   progress_animation_->StartThrobbing(-1);
 }