chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc - Issue 10780023: Change base::SystemMonitor's media device functions to take a type and string16 instead of a FilePa…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc

Issue 10780023: Change base::SystemMonitor's media device functions to take a type and string16 instead of a FilePa… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix win Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/media_gallery/media_device_notifications_window_win.cc ('K') | « chrome/browser/media_gallery/media_device_notifications_window_win.cc ('k') | chrome/browser/media_gallery/media_file_system_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc

===================================================================

--- chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc (revision 147551)

+++ chrome/browser/media_gallery/media_device_notifications_window_win_unittest.cc (working copy)

@@ -13,7 +13,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

#include "base/scoped_temp_dir.h"

-#include "base/sys_string_conversions.h"

+#include "base/string_number_conversions.h"

#include "base/system_monitor/system_monitor.h"

#include "base/test/mock_devices_changed_observer.h"

#include "content/public/test/test_browser_thread.h"

@@ -98,10 +98,13 @@

volume_broadcast.dbcv_unitmask |= 0x1 << *it;

std::wstring drive(L"_:\\");

drive[0] = 'A' + *it;

- std::string name("V");

- name.append(base::SysWideToUTF8(drive));

- EXPECT_CALL(observer_, OnMediaDeviceAttached(*it, name, FilePath(drive))).

- Times(0);

+ FilePath::StringType name = L"V" + drive;

+ EXPECT_CALL(observer_,

+ OnMediaDeviceAttached(base::IntToString(*it),

+ name,

+ base::SystemMonitor::TYPE_PATH,

+ drive))

+ .Times(0);

}

window_->OnDeviceChange(DBT_DEVICEARRIVAL,