drive: Set a custom User-Agent header for Drive operations

chrome/browser/google_apis/operations_base.cc

Index: chrome/browser/google_apis/operations_base.cc
diff --git a/chrome/browser/google_apis/operations_base.cc b/chrome/browser/google_apis/operations_base.cc
index 076ac3e0f184d194312aa22235779dcf6e0728ad..4acd71442e41f58d2d96fb123b2fa9a51f4f3298 100644
--- a/chrome/browser/google_apis/operations_base.cc
+++ b/chrome/browser/google_apis/operations_base.cc
@@ -10,6 +10,7 @@
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/net/url_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"
@@ -19,6 +20,7 @@
 #include "net/http/http_util.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
+#include "webkit/user_agent/user_agent_util.h"
 
 using content::BrowserThread;
 using net::URLFetcher;
@@ -62,6 +64,33 @@ void ParseJsonOnBlockingPool(const std::string& data,
   }
 }
 
+// Returns a user agent string used for communicating with the Drive backend,
+// both WAPI and Drive API.  The user agent looks like:
+//
+// chromedrive-<VERSION> chrome-cc/none (<OS_CPU_INFO>)
+// chromedrive-24.0.1274.0 chrome-cc/none (CrOS x86_64 0.4.0)
+//
+// TODO(satorux): Move this function to somewhere else: crbug.com/151605
+std::string GetDriveUserAgent() {
+  const char kDriveClientName[] = "chromedrive";
+
+  chrome::VersionInfo version_info;
+  const std::string version = (version_info.is_valid() ?
+                               version_info.Version() :
+                               std::string("unknown"));
+
+  // This part is <client_name>/<version>.
+  const std::string library = "chrome-cc/none";

[Daniel Erat, 2012/09/21 21:11:12]

nit: use const char kLibraryName[] here?

[satorux1, 2012/09/21 22:41:22]

Done.

+
+  const std::string os_cpu = webkit_glue::BuildOSCpuInfo();
+
+  return base::StringPrintf("%s-%s %s (%s)",
+                            kDriveClientName,
+                            version.c_str(),
+                            library.c_str(),
+                            os_cpu.c_str());
+}
+
 }  // namespace
 
 namespace gdata {
@@ -182,6 +211,10 @@ void UrlFetchOperationBase::Start(const std::string& auth_token) {
   // Note that SetExtraRequestHeaders clears the current headers and sets it
   // to the passed-in headers, so calling it for each header will result in
   // only the last header being set in request headers.
+  //
+  // TODO(satorux): The custom user-agent should be set only for Drive
+  // operations. crbug.com/151605
+  url_fetcher_->AddExtraRequestHeader("User-Agent: " + GetDriveUserAgent());
   url_fetcher_->AddExtraRequestHeader(kGDataVersionHeader);
   url_fetcher_->AddExtraRequestHeader(
         base::StringPrintf(kAuthorizationHeaderFormat, auth_token.data()));