cros: Enable Drive apps integration in app launcher.

chrome/browser/apps/drive/drive_app_provider_browsertest.cc

Index: chrome/browser/apps/drive/drive_app_provider_browsertest.cc
diff --git a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc
index 84416b33c01c669d689b9c2badba2a1aea3ef64f..97e173bcb1adb6ada424c7fbf198ec48abae17e7 100644
--- a/chrome/browser/apps/drive/drive_app_provider_browsertest.cc
+++ b/chrome/browser/apps/drive/drive_app_provider_browsertest.cc
@@ -17,6 +17,8 @@
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/install_tracker.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/web_application_info.h"
@@ -75,6 +77,11 @@ class DriveAppProviderTest : public ExtensionBrowserTest,
     provider_->SetDriveServiceBridgeForTest(
         make_scoped_ptr(new TestDriveServiceBridge(apps_registry_.get()))
             .PassAs<DriveServiceBridge>());
+
+    // The DriveAppProvider in AppListSyncalbeService interferes with the
+    // test. So resets it.
+    app_list::AppListSyncableServiceFactory::GetForProfile(profile())
+        ->ResetDriveAppProviderForTest();
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {