Revert 155364 - Revert 155317 - Adjust ChromeToMobile error logging and mitigation.

chrome/browser/chrome_to_mobile_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 #define CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 50 matching lines @@
     DEVICES_REQUESTED = 0,  // Cloud print was contacted to list devices.
     DEVICES_AVAILABLE,      // Cloud print returned 1+ compatible devices.
     BUBBLE_SHOWN,           // The page action bubble was shown.
     SNAPSHOT_GENERATED,     // A snapshot was successfully generated.
     SNAPSHOT_ERROR,         // An error occurred during snapshot generation.
     SENDING_URL,            // Send was invoked (with or without a snapshot).
     SENDING_SNAPSHOT,       // A snapshot was sent along with the page URL.
     SEND_SUCCESS,           // Cloud print responded with success on send.
     SEND_ERROR,             // Cloud print responded with failure on send.
     LEARN_MORE_CLICKED,     // The "Learn more" help article link was clicked.
+    BAD_TOKEN,              // The cloud print access token could not be minted.
+    BAD_SEARCH_AUTH,        // The cloud print search request failed (auth).
+    BAD_SEARCH_OTHER,       // The cloud print search request failed (other).
+    BAD_SEND_407,           // The cloud print send response was errorCode==407.
+                            // "Print job added but failed to notify printer..."
+    BAD_SEND_ERROR,         // The cloud print send response was errorCode!=407.
+    BAD_SEND_AUTH,          // The cloud print send request failed (auth).
+    BAD_SEND_OTHER,         // The cloud print send request failed (other).
     NUM_METRICS
   };
 
   // The supported mobile device operating systems.
   enum MobileOS {
     ANDROID = 0,
     IOS,
   };
 
   // The cloud print job types.
@@ skipping 138 matching lines @@
   std::set<FilePath> snapshots_;
 
   // The list of active URLFetcher requests owned by the service.
   ScopedVector<net::URLFetcher> url_fetchers_;
 
   // Map URLFetchers to observers for reporting OnSendComplete.
   typedef std::map<const net::URLFetcher*, base::WeakPtr<Observer> >
       RequestObserverMap;
   RequestObserverMap request_observer_map_;
 
-  // The pending OAuth access token request and a timer for retrying on failure.
+  // The pending OAuth access token request and timers for retrying on failure.
   scoped_ptr<OAuth2AccessTokenFetcher> access_token_fetcher_;
   base::OneShotTimer<ChromeToMobileService> auth_retry_timer_;
+  base::OneShotTimer<ChromeToMobileService> search_retry_timer_;
 
   // A queue of tasks to perform after an access token is lazily initialized.
   std::queue<base::Closure> task_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeToMobileService);
 };
 
 #endif  // CHROME_BROWSER_CHROME_TO_MOBILE_SERVICE_H_