summaryrefslogtreecommitdiffstats
path: root/ash/test/test_metro_viewer_process_host.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 04:03:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 04:03:32 +0000
commited95e02da69e469de255362cdb4114fe8e4c0c64 (patch)
tree5bb68bc6517f35f14ca98498cbc4f52f8b3dcfff /ash/test/test_metro_viewer_process_host.h
parent603af7ca8d0238e9b1a12b14a67655b831b047b7 (diff)
downloadchromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.zip
chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.gz
chromium_src-ed95e02da69e469de255362cdb4114fe8e4c0c64.tar.bz2
Update src/ash/ for renames and moves in base
Renames string16 -> base::string16 and base/string_number_conversions.h -> base/strings/string_number_conversions.h BUG= Review URL: https://codereview.chromium.org/13856005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/test_metro_viewer_process_host.h')
-rw-r--r--ash/test/test_metro_viewer_process_host.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/test/test_metro_viewer_process_host.h b/ash/test/test_metro_viewer_process_host.h
index de0969e..f52230b 100644
--- a/ash/test/test_metro_viewer_process_host.h
+++ b/ash/test/test_metro_viewer_process_host.h
@@ -32,7 +32,8 @@ class TestMetroViewerProcessHost : public IPC::Listener,
// and blocks until that viewer process connects or until a timeout is
// reached. Returns true if the viewer process connects before the timeout is
// reached.
- bool LaunchViewerAndWaitForConnection(const string16& app_user_model_id);
+ bool LaunchViewerAndWaitForConnection(
+ const base::string16& app_user_model_id);
// IPC::Sender implementation:
virtual bool Send(IPC::Message* msg) OVERRIDE;