Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: chrome/browser/extensions/api/messaging/native_messaging_apitest_posix.cc

Issue 10991044: Revert 158830 - Revert 156678 - Native messaging now uses the MessageService back-end. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/common/chrome_paths.h" 8 #include "chrome/common/chrome_paths.h"
9 #include "chrome/common/chrome_version_info.h" 9 #include "chrome/common/chrome_version_info.h"
10 #include "chrome/common/extensions/features/feature.h" 10 #include "chrome/common/extensions/features/feature.h"
11 11
12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NativeMessageBasic) { 12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NativeMessageBasic) {
13 // Override the user data dir to point to our native app. 13 // Override the user data dir to point to our native app.
14 extensions::Feature::ScopedCurrentChannel 14 extensions::Feature::ScopedCurrentChannel
15 current_channel(chrome::VersionInfo::CHANNEL_DEV); 15 current_channel(chrome::VersionInfo::CHANNEL_DEV);
16 FilePath test_user_data_dir; 16 FilePath test_user_data_dir;
17 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_user_data_dir)); 17 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_user_data_dir));
18 test_user_data_dir = test_user_data_dir.AppendASCII("native_messaging"); 18 test_user_data_dir = test_user_data_dir.AppendASCII("native_messaging");
19 ASSERT_TRUE(PathService::Override(chrome::DIR_USER_DATA, test_user_data_dir)); 19 ASSERT_TRUE(PathService::Override(chrome::DIR_USER_DATA, test_user_data_dir));
20 ASSERT_TRUE(RunExtensionTest("native_messaging")) << message_; 20 ASSERT_TRUE(RunExtensionTest("native_messaging")) << message_;
21 } 21 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698