Improve the device type constants.

chrome/browser/intents/device_attached_intent_source.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/intents/device_attached_intent_source.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 93 matching lines @@
     return;
 
   // TODO(kmadhusu): Dispatch intents on incognito window.
   if (browser_->profile()->IsOffTheRecord())
     return;
 
   // Only handle mass storage for now.
   // TODO(kmadhusu): Handle all device types. http://crbug.com/140353.
   MediaStorageUtil::Type type;
   MediaStorageUtil::CrackDeviceId(id, &type, NULL);
-  if (type == MediaStorageUtil::USB_MTP)
+  if (type == MediaStorageUtil::MTP_OR_PTP)
     return;
   DCHECK(MediaStorageUtil::IsRemovableDevice(id));
 
   // Sanity checks for |device_path|.
   const FilePath device_path(location);
   if (!device_path.IsAbsolute() || device_path.ReferencesParent())
     return;
 
   SystemMonitor::RemovableStorageInfo device_info(id, name, location);
   scoped_refptr<DispatchIntentTaskHelper> task = new DispatchIntentTaskHelper(
@@ skipping 34 matching lines @@
 
   // TODO(kmadhusu) This should be something like
   // RevokeFileSystemByDevice(std::string)
   FilePath path(it->second.location);
   fileapi::IsolatedContext::GetInstance()->RevokeFileSystemByPath(path);
 
 #if defined(SUPPORT_MEDIA_FILESYSTEM)
   // TODO(kmadhusu, vandebo): Clean up this code. http://crbug.com/140340.
   MediaStorageUtil::Type type;
   MediaStorageUtil::CrackDeviceId(it->second.device_id, &type, NULL);
-  if (type == MediaStorageUtil::USB_MTP) {
+  if (type == MediaStorageUtil::MTP_OR_PTP) {
     MediaDeviceMapService::GetInstance()->RemoveMediaDevice(
         it->second.location);
   }
 #endif
   device_id_map_.erase(it);
 }